diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml
index e41f5387add..b8041bd3759 100644
--- a/.github/workflows-source/ci-main.yml
+++ b/.github/workflows-source/ci-main.yml
@@ -349,7 +349,9 @@ jobs:
 
   cargo-clippy-linux:
     name: Cargo Clippy Linux
-    <<: *bazel-small-setup
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    if: ${{ vars.RUN_CI == 'true' }}
     steps:
       - <<: *before-script
       - <<: *checkout
@@ -360,8 +362,8 @@ jobs:
         shell: bash
         run: |
           set -eExuo pipefail
-          buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \
-              "$CI_PROJECT_DIR"/gitlab-ci/src/ci-scripts/rust-lint.sh
+          sudo apt update && sudo apt install -y protobuf-compiler
+          "$CI_PROJECT_DIR"/gitlab-ci/src/ci-scripts/rust-lint.sh
       - name: No run
         if: steps.filter.outputs.cargo == 'false'
         run: echo "No cargo changes, skipping run"
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index fbfe40c76b0..d011fda79f9 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -387,11 +387,8 @@ jobs:
           SETUPOS_FLAG: ${{ matrix.SETUPOS_FLAG }}
   cargo-clippy-linux:
     name: Cargo Clippy Linux
-    runs-on:
-      labels: bazel-runner-small
-    container:
-      image: ghcr.io/dfinity/ic-build@sha256:eb85228ebf7511e2589f86788345eb3d1c8144914a8a2fa771d4347ddacac413
-    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
     if: ${{ vars.RUN_CI == 'true' }}
     steps:
       - name: Before script
@@ -416,8 +413,8 @@ jobs:
         shell: bash
         run: |
           set -eExuo pipefail
-          buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \
-              "$CI_PROJECT_DIR"/gitlab-ci/src/ci-scripts/rust-lint.sh
+          sudo apt update && sudo apt install -y protobuf-compiler
+          "$CI_PROJECT_DIR"/gitlab-ci/src/ci-scripts/rust-lint.sh
       - name: No run
         if: steps.filter.outputs.cargo == 'false'
         run: echo "No cargo changes, skipping run"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index b04578dcbbd..1a31c88a7f7 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,4 +2,4 @@
 channel = "1.77.1"
 targets = ["wasm32-unknown-unknown"]
 profile = "default"
-components = ["rls"]
+components = ["rls", "rustfmt", "clippy"]