diff --git a/.github/workflows/e2e-base-setup.yaml b/.github/workflows/e2e-base-setup.yaml
index 5764b8cdb..704bc91e9 100644
--- a/.github/workflows/e2e-base-setup.yaml
+++ b/.github/workflows/e2e-base-setup.yaml
@@ -70,11 +70,17 @@ jobs:
           echo "REGISTRY=${{ inputs.node_provisioner }}${rand}.azurecr.io" >> $GITHUB_ENV
           echo "RUN_LLAMA_13B=false" >> $GITHUB_ENV
 
+      - name: Set Registry
+        if: ${{ inputs.isRelease }}
+        run: |
+          echo "REGISTRY=${{ inputs.registry }}" >> $GITHUB_ENV
+          echo "VERSION=$(echo ${{ inputs.tag }} | tr -d v)" >> $GITHUB_ENV
+
       - id: set-outputs
         run: |
           echo "cluster_name=${CLUSTER_NAME}" >> $GITHUB_OUTPUT
-          echo "registry=${REGISTRY}" >> $GITHUB_OUTPUT
-          echo "run_llama_13b=${RUN_LLAMA_13B}" >> $GITHUB_OUTPUT
+          echo "registry=${{ env.REGISTRY }}" >> $GITHUB_OUTPUT
+          echo "run_llama_13b=${{ env.RUN_LLAMA_13B }}" >> $GITHUB_OUTPUT
 
       - name: Remove existing Go modules directory
         run: sudo rm -rf ~/go/pkg/mod
diff --git a/.github/workflows/e2e-workflow.yml b/.github/workflows/e2e-workflow.yml
index f3c73bf01..8b0fbe21a 100644
--- a/.github/workflows/e2e-workflow.yml
+++ b/.github/workflows/e2e-workflow.yml
@@ -61,7 +61,7 @@ jobs:
         run: |
           echo "REGISTRY=${{ inputs.registry }}" >> $GITHUB_ENV
           echo "VERSION=$(echo ${{ inputs.tag }} | tr -d v)" >> $GITHUB_ENV
-              
+
       - name: build adapter image
         shell: bash
         run: |