diff --git a/.github/actions/fetch-and-rebase/action.yml b/.github/actions/fetch-and-rebase/action.yml
index fa72a6a67bdbd14f6ecd40a35b9cad2d65f63565..f2ff067e3d38888bef9cfb76d1263e3fa5194b71 100644
--- a/.github/actions/fetch-and-rebase/action.yml
+++ b/.github/actions/fetch-and-rebase/action.yml
@@ -21,6 +21,7 @@ runs:
         REPO_PATH: ${{ inputs.repo_path }}
         REMOTE_BRANCH: ${{ inputs.remote_branch }}
         LOOP: ${{ inputs.loop }}
+      working-directory: ${{ inputs.repo_path }}
       shell: bash
       run: |
         set +e
@@ -29,7 +30,6 @@ runs:
 
         for i in $(seq 1 ${LOOP})
         do
-          pushd ${REPO_PATH} &&
           git fetch --all &&
           git rebase ${REMOTE_BRANCH} &&
           git submodule sync &&
@@ -37,8 +37,7 @@ runs:
           git reset --hard HEAD &&
           git clean -dfx &&
           git submodule foreach git reset --hard HEAD &&
-          git submodule foreach git clean -dfx &&
-          popd
+          git submodule foreach git clean -dfx
 
           if [[ $? -ne 0 ]]
           then