diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml
index 590382428d5..66646cdfdc2 100644
--- a/.github/workflows-source/ci-main.yml
+++ b/.github/workflows-source/ci-main.yml
@@ -123,12 +123,10 @@ jobs:
     steps:
       - <<: *before-script
       - <<: *checkout
-        uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
         if : ${{ github.event_name == 'pull_request' }}
         with:
           fetch-depth: 256
       - <<: *checkout
-        uses: actions/checkout@v3
         if : ${{ github.event_name != 'pull_request' }}
       - <<: *docker-ro-login
       - name: Run Bazel Test All
@@ -160,12 +158,10 @@ jobs:
     steps:
       - <<: *before-script
       - <<: *checkout
-        uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
         if : ${{ github.event_name == 'pull_request' }}
         with:
           fetch-depth: 256
       - <<: *checkout
-        uses: actions/checkout@v3
         if : ${{ github.event_name != 'pull_request' }}
       - <<: *docker-ro-login
       - name: Run bazel build --config=check //rs/...
@@ -282,12 +278,10 @@ jobs:
     steps:
       - <<: *before-script
       - <<: *checkout
-        uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
         if : ${{ github.event_name == 'pull_request' }}
         with:
           fetch-depth: 256
       - <<: *checkout
-        uses: actions/checkout@v3
         if : ${{ github.event_name != 'pull_request' }}
       - <<: *docker-ro-login
       - name: Run Build IC
@@ -346,11 +340,11 @@ jobs:
       - <<: *before-script
       - <<: *checkout
       - name: Download bazel-targets [bazel-test-all]
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bazel-targets
       - name: Download build-ic.tar [build-ic]
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-ic
       - name: Build Determinism Test
@@ -368,7 +362,7 @@ jobs:
 
   cargo-clippy-linux:
     name: Cargo Clippy Linux
-    <<: *dind-large-setup
+    <<: *bazel-small-setup
     steps:
       - <<: *before-script
       - <<: *checkout
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 8ca23d80902..d1837b45649 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -51,12 +51,12 @@ jobs:
           if [ -e /__w/cache ]; then sudo ln -s /__w/cache /; fi
           if [ -n "${NODE_NAME:-}" ]; then echo "Node: $NODE_NAME"; fi
       - name: Checkout
-        uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'pull_request' }}
         with:
           fetch-depth: 256
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name != 'pull_request' }}
       - name: Docker RO SA login
         id: docker-ro-login
@@ -109,12 +109,12 @@ jobs:
           if [ -e /__w/cache ]; then sudo ln -s /__w/cache /; fi
           if [ -n "${NODE_NAME:-}" ]; then echo "Node: $NODE_NAME"; fi
       - name: Checkout
-        uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'pull_request' }}
         with:
           fetch-depth: 256
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name != 'pull_request' }}
       - name: Docker RO SA login
         id: docker-ro-login
@@ -307,12 +307,12 @@ jobs:
           if [ -e /__w/cache ]; then sudo ln -s /__w/cache /; fi
           if [ -n "${NODE_NAME:-}" ]; then echo "Node: $NODE_NAME"; fi
       - name: Checkout
-        uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'pull_request' }}
         with:
           fetch-depth: 256
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name != 'pull_request' }}
       - name: Docker RO SA login
         id: docker-ro-login
@@ -386,11 +386,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Download bazel-targets [bazel-test-all]
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bazel-targets
       - name: Download build-ic.tar [build-ic]
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-ic
       - name: Build Determinism Test
@@ -408,10 +408,10 @@ jobs:
   cargo-clippy-linux:
     name: Cargo Clippy Linux
     runs-on:
-      labels: dind-runner-large
+      labels: bazel-runner-small
     container:
       image: ghcr.io/dfinity/ic-build@sha256:eb85228ebf7511e2589f86788345eb3d1c8144914a8a2fa771d4347ddacac413
-    timeout-minutes: 60
+    timeout-minutes: 45
     if: ${{ vars.RUN_CI == 'true' }}
     steps:
       - name: Before script