diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml
index 0b67328c5c7..496307bbca7 100644
--- a/.github/workflows/cd-feature-branch.yml
+++ b/.github/workflows/cd-feature-branch.yml
@@ -45,12 +45,9 @@ jobs:
 
     outputs:
       server_version: ${{ steps.release_metadata.outputs.server_version }}
+      short_server_version: ${{ steps.release_metadata.outputs.short_server_version }}
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.release_branch }}
-
       # actions/setup-python doesn't yet support ARM
       - name: Setup Python on x64
         if: ${{ !endsWith(matrix.runner, '-arm64') }}
@@ -82,6 +79,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install git -y
 
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.release_branch }}
+
       - name: Check python version
         run: |
           python --version
@@ -104,7 +105,8 @@ jobs:
             echo "release_platform=linux/arm64" >> $GITHUB_OUTPUT
             echo "short_release_platform=arm64" >> $GITHUB_OUTPUT
           fi
-          echo "server_version=${{ github.event.inputs.release_version }}+${{github.events.inputs.release_id}}.$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
+          echo "server_version=${{ github.event.inputs.release_version }}+${{ github.event.inputs.release_id }}.$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
+          echo "short_server_version=${{ github.event.inputs.release_version }}" >> $GITHUB_OUTPUT
 
       - name: Bump to Final Release version
         run: |
@@ -249,35 +251,35 @@ jobs:
         working-directory: /tmp/digests/syft-backend
         run: |
           docker buildx imagetools create  \
-            -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.server_version }} \
+            -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \
             $(printf 'openmined/syft-backend@sha256:%s ' *)
 
       - name: Create manifest list and push for syft-frontend
         working-directory: /tmp/digests/syft-frontend
         run: |
           docker buildx imagetools create  \
-            -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.server_version }} \
+            -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \
             $(printf 'openmined/syft-frontend@sha256:%s ' *)
 
       - name: Create manifest list and push for syft-seaweedfs
         working-directory: /tmp/digests/syft-seaweedfs
         run: |
           docker buildx imagetools create  \
-            -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.server_version }} \
+            -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \
             $(printf 'openmined/syft-seaweedfs@sha256:%s ' *)
 
       - name: Create manifest list and push for syft-enclave-attestation
         working-directory: /tmp/digests/syft-enclave-attestation
         run: |
           docker buildx imagetools create  \
-            -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.server_version }} \
+            -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \
             $(printf 'openmined/syft-enclave-attestation@sha256:%s ' *)
 
       - name: Create manifest list and push for syft client
         working-directory: /tmp/digests/syft
         run: |
           docker buildx imagetools create  \
-            -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.server_version }} \
+            -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \
             $(printf 'openmined/syft-client@sha256:%s ' *)
 
   deploy-syft: