diff --git a/.gcp/release-docker.yaml b/.gcp/release-docker.yaml
index b85072cb..8ef0deec 100644
--- a/.gcp/release-docker.yaml
+++ b/.gcp/release-docker.yaml
@@ -34,8 +34,8 @@ steps:
         else
           echo "Development/RC release detected. Using commit SHA as tag."
         fi
-        echo "Determined image tag: $FINAL_TAG"
-        echo "$FINAL_TAG" > /workspace/image_tag.txt
+        echo "Determined image tag: $$FINAL_TAG"
+        echo "$$FINAL_TAG" > /workspace/image_tag.txt
 
   # Step 7: Build sandbox container image
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
@@ -44,8 +44,8 @@ steps:
     args:
       - -c
       - |
-        export GEMINI_SANDBOX_IMAGE_TAG=$(cat /workspace/image_tag.txt)
-        echo "Using Docker image tag for build: $GEMINI_SANDBOX_IMAGE_TAG"
+        export GEMINI_SANDBOX_IMAGE_TAG=$$(cat /workspace/image_tag.txt)
+        echo "Using Docker image tag for build: $$GEMINI_SANDBOX_IMAGE_TAG"
         npm run build:sandbox:fast
     env:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
@@ -57,8 +57,8 @@ steps:
     args:
       - -c
       - |
-        export GEMINI_SANDBOX_IMAGE_TAG=$(cat /workspace/image_tag.txt)
-        echo "Using Docker image tag for publish: $GEMINI_SANDBOX_IMAGE_TAG"
+        export GEMINI_SANDBOX_IMAGE_TAG=$$(cat /workspace/image_tag.txt)
+        echo "Using Docker image tag for publish: $$GEMINI_SANDBOX_IMAGE_TAG"
         npm run publish:sandbox
     env:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
diff --git a/.github/workflows/scheduled-nightly-release.yml b/.github/workflows/scheduled-nightly-release.yml
index f55d5570..657416b1 100644
--- a/.github/workflows/scheduled-nightly-release.yml
+++ b/.github/workflows/scheduled-nightly-release.yml
@@ -33,15 +33,21 @@ jobs:
         run: npm run preflight
 
       - name: Run Integration Tests (without Docker)
-        uses: nick-invision/retry@v2
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08
+        env:
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
         with:
+          timeout_minutes: 10
           max_attempts: 3
           retry_wait_seconds: 30
           command: npm run test:integration:sandbox:none
 
       - name: Run Integration Tests (with Docker)
-        uses: nick-invision/retry@v2
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08
+        env:
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
         with:
+          timeout_minutes: 10
           max_attempts: 3
           retry_wait_seconds: 30
           command: npm run test:integration:sandbox:docker
@@ -63,6 +69,6 @@ jobs:
           gh issue create \
             --title "Nightly Release Failed on $(date +'%Y-%m-%d')" \
             --body "The scheduled nightly release workflow failed. See the full run for details: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-            --label "bug,nightly-failure"
+            --label "type: bug,nightly-failure"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}