diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 4e122d9de4b88..3d991818d59dc 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -113,74 +113,9 @@ jobs:
       bootloader: ${{ env.bootloader }}
       docker_service: ${{ env.docker_service }}
 
-  # Builds, tags, and pushes Cobalt docker build images to ghr.
-  docker-build-image:
-    needs: [initialize]
-    runs-on: [self-hosted, linux, X64]
-    permissions:
-      packages: write
-    steps:
-      - name: Checkout files
-        uses: kaidokert/checkout@v3.5.999
-        with:
-          fetch-depth: 2
-          persist-credentials: false
-      - name: Login to Docker Registry ${{env.REGISTRY}}
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build docker image
-        id: build-docker-image
-        uses: ./.github/actions/docker
-        with:
-          docker_service: ${{ needs.initialize.outputs.docker_service }}
-          docker_image: cobalt-${{ needs.initialize.outputs.docker_service }}
-      - name: Set Docker Tag Output
-        id: set-docker-tag-output
-        run: |
-          echo $DOCKER_TAG
-          echo "docker_tag=$DOCKER_TAG"  >> $GITHUB_ENV
-    outputs:
-      docker_tag: ${{env.docker_tag}}
-
-  # Builds, tags, and pushes Cobalt unit test image to ghr.
-  docker-unittest-image:
-    if: needs.initialize.outputs.on_host_test == 'true'
-    needs: [initialize]
-    permissions:
-      packages: write
-    runs-on: [self-hosted, linux, X64]
-    steps:
-      - name: Checkout files
-        uses: kaidokert/checkout@v3.5.999
-        with:
-          fetch-depth: 2
-          persist-credentials: false
-      - name: Login to Docker Registry ${{env.REGISTRY}}
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build docker image
-        id: build-docker-image
-        uses: ./.github/actions/docker
-        with:
-          docker_service: linux-x64x11-unittest
-          docker_image: cobalt-linux-x64x11-unittest
-      - name: Set Docker Tag Output
-        id: set-docker-unittest-tag-output
-        run: |
-          echo $DOCKER_TAG
-          echo "docker_unittest_tag=$DOCKER_TAG" >> $GITHUB_ENV
-    outputs:
-      docker_unittest_tag: ${{env.docker_unittest_tag}}
-
   # Runs builds.
   build:
-    needs: [initialize, docker-build-image]
+    needs: [initialize]
     permissions: {}
     runs-on: [self-hosted, linux, X64]
     name: ${{matrix.name}}_${{matrix.config}}
@@ -190,7 +125,7 @@ jobs:
         platform: ${{ fromJson(needs.initialize.outputs.platforms) }}
         include: ${{ fromJson(needs.initialize.outputs.includes) }}
         config: [devel, debug, qa, gold]
-    container: ${{ needs.docker-build-image.outputs.docker_tag }}
+    # container: ${{ needs.docker-build-image.outputs.docker_tag }}
     env:
       # We want temp folder to be on tmpfs which makes workloads faster.
       # However, dind container ends up having / folder mounted on overlay
@@ -215,7 +150,7 @@ jobs:
           ( github.event_name == 'push' && vars.RUN_ODT_TESTS_ON_POSTSUBMIT != 'False' ) )
     runs-on: [self-hosted, linux, X64]
     name: ${{ matrix.name }}_on_device_${{ matrix.shard }}
-    container: ${{ needs.docker-unittest-image.outputs.docker_unittest_tag }}
+    # container: ${{ needs.docker-unittest-image.outputs.docker_unittest_tag }}
     permissions: {}
     strategy:
       fail-fast: false
@@ -235,7 +170,7 @@ jobs:
 
   # Runs on-host integration and unit tests.
   on-host-test:
-    needs: [initialize, docker-unittest-image, build]
+    needs: [initialize, build]
     permissions: {}
     if: needs.initialize.outputs.on_host_test == 'true'
     runs-on: [self-hosted, linux, X64]