diff --git a/.github/workflows/benchmarker.yml b/.github/workflows/benchmarker.yml
index b27ba205..662b7cd7 100644
--- a/.github/workflows/benchmarker.yml
+++ b/.github/workflows/benchmarker.yml
@@ -78,7 +78,6 @@ jobs:
         with:
           python-version: 3.11
           cache: 'pip'
-          working-directory: ${{ github.workspace }}/shot-benchmarker
 
       - shell: bash
         run: pip install -r requirements.txt
@@ -91,13 +90,13 @@ jobs:
       - name: Setup GAMS License file
         if: ${{ inputs.enable_gams }}
         shell: bash
-        working-directory: ${{github.workspace}}
+        working-directory: ${{ github.workspace }}
         run: echo ${{ secrets.gams_license }} | base64 -d > $GAMS_LICENSE_FILE
 
       - name: Setup Gurobi License file
         if: ${{ inputs.enable_gurobi }}
         shell: bash
-        working-directory: ${{github.workspace}}
+        working-directory: ${{ github.workspace }}
         run: echo ${{ secrets.gurobi_license }} | base64 -d > $GRB_LICENSE_FILE
 
       - shell: bash
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 6044e37b..3eb00489 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -44,7 +44,7 @@ jobs:
       benchmark_type: "nl"
       enable_gurobi: false
       enable_gams: false
-      shot_artifact: ${{ needs.build-test.outputs.binary-artifact }}
+      shot_artifact: shot-binary-${{ github.sha }}
     secrets:
       gurobi_license: ${{ secrets.GUROBI_LICENSE_FILE }}
       gams_license: ${{ secrets.GAMS_LICENSE_FILE }}
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
index 10faf11c..c42415eb 100644
--- a/.github/workflows/build-workflow.yml
+++ b/.github/workflows/build-workflow.yml
@@ -300,11 +300,11 @@ jobs:
         if: ${{ inputs.upload_artifacts }}
         shell: bash
         run: |
-          echo "test=test-logs-${{ env.VERSION }}" >> $GITHUB_OUTPUT
-          echo "options=shot-optsfile-${{ env.VERSION }}" >> $GITHUB_OUTPUT
-          echo "binary=shot-binary-${{ env.VERSION }}" >> $GITHUB_OUTPUT
-          echo "package=shot-package-${{ env.VERSION }}" >> $GITHUB_OUTPUT
-          echo "library=shot-libraries-${{ env.VERSION }}" >> $GITHUB_OUTPUT
+          echo "test=test-logs-${{ env.VERSION }}${{ env.ARTIFACT_SUFFIX }}" >> $GITHUB_OUTPUT
+          echo "options=shot-optsfile-${{ env.VERSION }}${{ env.ARTIFACT_SUFFIX }}" >> $GITHUB_OUTPUT
+          echo "binary=shot-binary-${{ env.VERSION }}${{ env.ARTIFACT_SUFFIX }}" >> $GITHUB_OUTPUT
+          echo "package=shot-package-${{ env.VERSION }}${{ env.ARTIFACT_SUFFIX }}" >> $GITHUB_OUTPUT
+          echo "library=shot-libraries-${{ env.VERSION }}${{ env.ARTIFACT_SUFFIX }}" >> $GITHUB_OUTPUT
 
       - name: Output test artifacts
         if: ${{ inputs.upload_artifacts }} != true && steps.output-artifacts.outcome != 'success'