diff --git a/.github/workflows/build-tutorials.yml b/.github/workflows/build-tutorials.yml
index 9391f1857ae..809b9ad4bfc 100644
--- a/.github/workflows/build-tutorials.yml
+++ b/.github/workflows/build-tutorials.yml
@@ -34,7 +34,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.runner }}
     env:
-      DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-bionic-cuda12.1-cudnn8-py3-gcc9"
+      DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-focal-cuda12.1-cudnn8-py3-gcc9"
       CUDA_VERSION: "9"
     steps:
       - name: Setup SSH (Click me for login details)
@@ -115,9 +115,9 @@ jobs:
     name: pytorch_tutorial_build_manager
     needs: worker
     runs-on: [self-hosted, linux.2xlarge]
-    environment: pytorchbot-env
+    environment: ${{ github.ref == 'refs/heads/main' && 'pytorchbot-env' || '' }}
     env:
-      DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-bionic-cuda12.1-cudnn8-py3-gcc9"
+      DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-focal-cuda12.1-cudnn8-py3-gcc9"
       CUDA_VERSION: "9"
     steps:
       - name: Setup SSH (Click me for login details)