diff --git a/dist/index.js b/dist/index.js
index 5a7174f..d6d84f8 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -455,14 +455,17 @@ function createPullRequest(inputs) {
                             authorization: 'token ' + inputs.token
                         }
                     });
-                    let repoOwner = process.env.GITHUB_REPOSITORY.split('/')[0];
-                    if (inputs.pushToFork) {
-                        const forkName = yield githubHelper.getRepositoryParent(baseRemote.repository);
-                        if (!forkName) {
-                            repoOwner = forkName;
-                        }
-                    }
-                    const repoName = process.env.GITHUB_REPOSITORY.split('/')[1];
+                    // let repoOwner = process.env.GITHUB_REPOSITORY!.split('/')[0]
+                    // if (inputs.pushToFork) {
+                    //   const forkName = await githubHelper.getRepositoryParent(
+                    //     baseRemote.repository
+                    //   )
+                    //   if (!forkName) {
+                    //     repoOwner = forkName!
+                    //   }
+                    // }
+                    // const repoName = process.env.GITHUB_REPOSITORY!.split('/')[1]
+                    const [repoOwner, repoName] = branchRepository.split('/');
                     core.debug(`repoOwner: '${repoOwner}', repoName: '${repoName}'`);
                     const refQuery = `
             query GetRefId($repoName: String!, $repoOwner: String!, $branchName: String!) {
diff --git a/src/create-pull-request.ts b/src/create-pull-request.ts
index 80c2f62..1b2d060 100644
--- a/src/create-pull-request.ts
+++ b/src/create-pull-request.ts
@@ -210,16 +210,17 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
           }
         })
 
-        let repoOwner = process.env.GITHUB_REPOSITORY!.split('/')[0]
-        if (inputs.pushToFork) {
-          const forkName = await githubHelper.getRepositoryParent(
-            baseRemote.repository
-          )
-          if (!forkName) {
-            repoOwner = forkName!
-          }
-        }
-        const repoName = process.env.GITHUB_REPOSITORY!.split('/')[1]
+        // let repoOwner = process.env.GITHUB_REPOSITORY!.split('/')[0]
+        // if (inputs.pushToFork) {
+        //   const forkName = await githubHelper.getRepositoryParent(
+        //     baseRemote.repository
+        //   )
+        //   if (!forkName) {
+        //     repoOwner = forkName!
+        //   }
+        // }
+        // const repoName = process.env.GITHUB_REPOSITORY!.split('/')[1]
+        const [repoOwner, repoName] = branchRepository.split('/')
 
         core.debug(`repoOwner: '${repoOwner}', repoName: '${repoName}'`)
         const refQuery = `