diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 61c29ab60..09998f244 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
         run: |
           # Extract the product name (part before the first slash) and version (part after the first slash)
           PRODUCT=$(echo "${GITHUB_REF#refs/tags/}" | cut -d'/' -f1)
-          VERSION=$(echo "${GITHUB_REF#refs/tags/}" | cut -d'/v' -f2)
+          VERSION=$(echo "${GITHUB_REF#refs/tags/}" | cut -d'/' -f2)
 
           # Output extracted values for the rest of the job
           echo "PRODUCT=${PRODUCT}" >> $GITHUB_ENV
@@ -40,6 +40,6 @@ jobs:
       - name: Build the images of all the OC projects
         run: |
           devcontainer exec --workspace-folder ../sage-monorepo bash -c ". ./dev-env.sh \
-            && echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ghcr.io \
             && export VERSION=${{ env.VERSION }} \
+            && echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ghcr.io \
             && nx build-image ${{ env.PRODUCT }}-apex --configuration=ci"