diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dd3b0f20e..462e9689f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -77,10 +77,10 @@ jobs:
     - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
     - run: git fetch origin main
     - name: Extract base commit
-      run: if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ]; then result="main"; else result="${{ github.event.pull_request.base.sha }}"; fi && echo "result=$result" >> $GITHUB_OUTPUT
+      run: if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ]; then result="git rev-parse main"; else result="${{ github.event.pull_request.base.sha }}"; fi && echo "result=$result" >> $GITHUB_OUTPUT
       id: extract_base_commit
     - name: Extract head commit
-      run: if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ]; then result=$(git symbolic-ref --short HEAD); else result="${{ github.event.pull_request.head.sha }}"; fi && echo "result=$result" >> $GITHUB_OUTPUT
+      run: if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ]; then result=$(git rev-parse HEAD); else result="${{ github.event.pull_request.head.sha }}"; fi && echo "result=$result" >> $GITHUB_OUTPUT
       id: extract_head_commit
     - name: Get packages affected by changes in the current commit
       id: get_affected