diff --git a/.devcontainer/post_create_command.sh b/.devcontainer/post_create_command.sh
index 28f6690a62..6c15e1cf4e 100755
--- a/.devcontainer/post_create_command.sh
+++ b/.devcontainer/post_create_command.sh
@@ -10,7 +10,7 @@ sudo apt install -y protobuf-compiler build-essential libssl-dev pkg-config open
 cargo install sqlx-cli
 
 # Install the Rust toolchain.
-RUST_VERSION=$(cat toolchain.txt)
+RUST_VERSION=$(grep 'channel' coprocessor/fhevm-engine/rust-toolchain.toml | awk -F' = ' '{print $2}' | tr -d '"')
 rustup toolchain install $RUST_VERSION
 rustup component add --toolchain $RUST_VERSION rustfmt
 rustup component add --toolchain $RUST_VERSION clippy
diff --git a/.github/workflows/coprocessor-docker-build.yml b/.github/workflows/coprocessor-docker-build.yml
index dc978b6c36..1357173219 100644
--- a/.github/workflows/coprocessor-docker-build.yml
+++ b/.github/workflows/coprocessor-docker-build.yml
@@ -138,7 +138,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-db-migration == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_db_migration)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets: &docker_secrets
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
@@ -158,6 +158,7 @@ jobs:
       image-name: "fhevm/coprocessor/db-migration"
       docker-file: "coprocessor/fhevm-engine/db-migration/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-db-migration"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
 
   build-gw-listener:
     needs: check-changes
@@ -165,7 +166,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-gw-listener == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_gw_listener)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -174,6 +175,7 @@ jobs:
       image-name: "fhevm/coprocessor/gw-listener"
       docker-file: "./coprocessor/fhevm-engine/gw-listener/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-gw-listener"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
 
   build-host-listener:
     needs: check-changes
@@ -181,7 +183,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-host-listener == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_host_listener)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -190,6 +192,7 @@ jobs:
       image-name: "fhevm/coprocessor/host-listener"
       docker-file: "coprocessor/fhevm-engine/host-listener/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-host-listener"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
 
   build-sns-worker:
     needs: check-changes
@@ -197,7 +200,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-sns-worker == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_sns_worker)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -206,6 +209,7 @@ jobs:
       image-name: "fhevm/coprocessor/sns-worker"
       docker-file: "coprocessor/fhevm-engine/sns-worker/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-sns-worker"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
 
   build-tfhe-worker:
     needs: check-changes
@@ -213,7 +217,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-tfhe-worker == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_tfhe_worker)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -222,6 +226,7 @@ jobs:
       image-name: "fhevm/coprocessor/tfhe-worker"
       docker-file: "coprocessor/fhevm-engine/tfhe-worker/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-tfhe-worker"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
 
   build-tx-sender:
     needs: check-changes
@@ -229,7 +234,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-tx-sender == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_tx_sender)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -238,6 +243,7 @@ jobs:
       image-name: "fhevm/coprocessor/tx-sender"
       docker-file: "./coprocessor/fhevm-engine/transaction-sender/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-tx-sender"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
 
   build-zkproof-worker:
     needs: check-changes
@@ -245,7 +251,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-zkproof-worker == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_zkproof_worker)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -254,6 +260,7 @@ jobs:
       image-name: "fhevm/coprocessor/zkproof-worker"
       docker-file: "coprocessor/fhevm-engine/zkproof-worker/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-zkproof-worker"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
 
   re-tag-db-migration-image:
     needs: check-changes
diff --git a/.github/workflows/coprocessor-stress-test-tool-docker-build.yml b/.github/workflows/coprocessor-stress-test-tool-docker-build.yml
index eea773826a..58cdecc17b 100644
--- a/.github/workflows/coprocessor-stress-test-tool-docker-build.yml
+++ b/.github/workflows/coprocessor-stress-test-tool-docker-build.yml
@@ -41,7 +41,7 @@ jobs:
       needs.check-changes.outputs.changes-coprocessor-stress-test-tool == 'true'
       || github.event_name == 'release'
       || github.event_name == 'workflow_dispatch'
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets:
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
@@ -63,3 +63,4 @@ jobs:
       image-name: "fhevm/coprocessor/stress-test-tool"
       docker-file: "coprocessor/fhevm-engine/stress-test-generator/Dockerfile"
       app-cache-dir: "fhevm-coprocessor-stress-test-tool"
+      rust-toolchain-file-path: coprocessor/fhevm-engine/rust-toolchain.toml
diff --git a/.github/workflows/gateway-contracts-docker-build.yml b/.github/workflows/gateway-contracts-docker-build.yml
index c2967abf33..512699eb09 100644
--- a/.github/workflows/gateway-contracts-docker-build.yml
+++ b/.github/workflows/gateway-contracts-docker-build.yml
@@ -57,7 +57,7 @@ jobs:
       needs.check-changes.outputs.changes-gw-contracts == 'true'
       || github.event_name == 'release'
       || github.event_name == 'workflow_dispatch'
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets:
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
diff --git a/.github/workflows/gateway-stress-tool-docker-build.yml b/.github/workflows/gateway-stress-tool-docker-build.yml
index 9600794876..d27ffc541a 100644
--- a/.github/workflows/gateway-stress-tool-docker-build.yml
+++ b/.github/workflows/gateway-stress-tool-docker-build.yml
@@ -11,7 +11,7 @@ concurrency:
 
 jobs:
   build:
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets:
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
@@ -33,3 +33,4 @@ jobs:
       image-name: "fhevm/test-suite/gateway-stress-tool"
       docker-file: "./test-suite/gateway-stress/Dockerfile"
       app-cache-dir: "fhevm-gateway-stress-tool"
+      rust-toolchain-file-path: test-suite/gateway-stress/rust-toolchain.toml
diff --git a/.github/workflows/golden-container-images-docker-build-nodejs.yml b/.github/workflows/golden-container-images-docker-build-nodejs.yml
index fcacfcf876..9c56fb18c1 100644
--- a/.github/workflows/golden-container-images-docker-build-nodejs.yml
+++ b/.github/workflows/golden-container-images-docker-build-nodejs.yml
@@ -46,7 +46,7 @@ jobs:
     name: golden-container-images-docker-build-nodejs/build
     needs: check-changes
     if: ${{ needs.check-changes.outputs.changes-golden-nodejs == 'true' || github.event_name == 'release' }}
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets:
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
diff --git a/.github/workflows/golden-container-images-docker-build-rust.yml b/.github/workflows/golden-container-images-docker-build-rust.yml
index 89f659fb95..767bb68579 100644
--- a/.github/workflows/golden-container-images-docker-build-rust.yml
+++ b/.github/workflows/golden-container-images-docker-build-rust.yml
@@ -3,17 +3,21 @@ name: golden-container-images-docker-build-rust
 on:
   workflow_dispatch:
     inputs:
-      push_image:
-        description: 'Push the image to the registry'
+      push-image:
+        description: "Push the image to the registry"
         default: true
         required: true
         type: boolean
       tag:
-        description: 'Tag to use for the image'
-        default: 'latest'
-        required: true
+        description: "Tag to use for the image"
+        default: ""
+        required: false
+        type: string
+      rust-version:
+        description: "The rust version to use"
+        default: "stable"
+        required: false
         type: string
-  pull_request:
 
 permissions: {}
 
@@ -22,58 +26,8 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
-  check-changes:
-    name: golden-container-images-docker-build-rust/check-changes
-    permissions:
-      actions: 'read' # Required to read workflow run information
-      contents: 'read' # Required to checkout repository code
-      pull-requests: 'read' # Required to read pull request information
-    runs-on: ubuntu-latest
-    outputs:
-      changes-golden-rust: ${{ steps.filter.outputs.golden-rust }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: 'false'
-      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36  # v3.0.2
-        id: filter
-        with:
-          filters: |
-            golden-rust:
-              - '.github/workflows/golden-container-images-docker-build-rust.yml'
-              - 'golden-container-images/rust-glibc/**'
-              - toolchain.txt
-  determine-tag:
-    name: golden-container-images-docker-build-rust/determine-tag
-    permissions:
-      actions: 'read' # Required to read workflow run information
-      contents: 'read' # Required to checkout repository code
-      pull-requests: 'read' # Required to read pull request information
-    runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.set-tag.outputs.tag }}
-    steps:
-      - name: Checkout Project
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: 'false'
-      - id: set-tag
-        env:
-          TAG: ${{ github.event.inputs.tag }}
-          WORKSPACE: ${{ github.workspace }}
-        run: |
-          if [[ -n "${TAG}" ]]; then
-            echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          else
-            if [[ -f "${WORKSPACE}/toolchain.txt" ]]; then
-              echo "tag=$(cat "${WORKSPACE}"/toolchain.txt)" >> "$GITHUB_OUTPUT"
-            fi
-          fi
   build:
-    name: golden-container-images-docker-build-rust/build
-    needs: [check-changes, determine-tag]
-    if: ${{ needs.check-changes.outputs.changes-golden-rust == 'true' }}
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets:
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
@@ -90,9 +44,10 @@ jobs:
     with:
       use-cgr-secrets: true
       working-directory: "."
-      push_image: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.push_image == 'true' || github.event_name != 'workflow_dispatch' && true }}
+      push_image: ${{ inputs.push-image }}
       image-name: "fhevm/gci/rust-glibc"
-      image-tag: ${{ needs.determine-tag.outputs.tag }}
+      image-tag: ${{ inputs.tag }}
+      rust-version: ${{ inputs.rust-version }}
       docker-file: "./golden-container-images/rust-glibc/Dockerfile"
       app-cache-dir: "fhevm-golden-rust"
       ref: ${{ github.event_name == 'workflow_dispatch' && format('refs/tags/{0}', github.event.inputs.tag) || '' }}
diff --git a/.github/workflows/host-contracts-docker-build.yml b/.github/workflows/host-contracts-docker-build.yml
index 2c5d6a0af7..b56f080cfd 100644
--- a/.github/workflows/host-contracts-docker-build.yml
+++ b/.github/workflows/host-contracts-docker-build.yml
@@ -58,7 +58,7 @@ jobs:
       needs.check-changes.outputs.changes-host-contracts == 'true'
       || github.event_name == 'release'
       || github.event_name == 'workflow_dispatch'
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets:
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
diff --git a/.github/workflows/kms-connector-docker-build.yml b/.github/workflows/kms-connector-docker-build.yml
index fceb12ff91..7b0a4392d4 100644
--- a/.github/workflows/kms-connector-docker-build.yml
+++ b/.github/workflows/kms-connector-docker-build.yml
@@ -103,7 +103,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-db-migration == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_db_migration)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets: &docker_secrets
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
@@ -123,6 +123,7 @@ jobs:
       image-name: "fhevm/kms-connector/db-migration"
       docker-file: "kms-connector/connector-db/Dockerfile"
       app-cache-dir: "fhevm-kms-connector-db-migration"
+      rust-toolchain-file-path: kms-connector/rust-toolchain.toml
 
   build-gw-listener:
     needs: check-changes
@@ -130,7 +131,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-gw-listener == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_gw_listener)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -139,6 +140,7 @@ jobs:
       image-name: "fhevm/kms-connector/gw-listener"
       docker-file: "./kms-connector/crates/gw-listener/Dockerfile"
       app-cache-dir: "fhevm-kms-connector-gw-listener"
+      rust-toolchain-file-path: kms-connector/rust-toolchain.toml
 
   build-kms-worker:
     needs: check-changes
@@ -146,7 +148,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-kms-worker == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_kms_worker)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -155,6 +157,7 @@ jobs:
       image-name: "fhevm/kms-connector/kms-worker"
       docker-file: "./kms-connector/crates/kms-worker/Dockerfile"
       app-cache-dir: "fhevm-kms-connector-kms-worker"
+      rust-toolchain-file-path: kms-connector/rust-toolchain.toml
 
   build-tx-sender:
     needs: check-changes
@@ -162,7 +165,7 @@ jobs:
       github.event_name == 'release'
       || (github.event_name != 'workflow_dispatch' && needs.check-changes.outputs.changes-tx-sender == 'true')
       || (github.event_name == 'workflow_dispatch' && inputs.build_tx_sender)
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     permissions: *docker_permissions
     secrets: *docker_secrets
     with:
@@ -171,6 +174,7 @@ jobs:
       image-name: "fhevm/kms-connector/tx-sender"
       docker-file: "./kms-connector/crates/tx-sender/Dockerfile"
       app-cache-dir: "fhevm-kms-connector-tx-sender"
+      rust-toolchain-file-path: kms-connector/rust-toolchain.toml
 
   re-tag-db-migration-image:
     needs: check-changes
diff --git a/.github/workflows/test-suite-docker-build.yml b/.github/workflows/test-suite-docker-build.yml
index 9690c6fa84..1bbdf7720e 100644
--- a/.github/workflows/test-suite-docker-build.yml
+++ b/.github/workflows/test-suite-docker-build.yml
@@ -59,7 +59,7 @@ jobs:
       needs.check-changes.outputs.changes-e2e-docker == 'true'
       || github.event_name == 'release'
       || github.event_name == 'workflow_dispatch'
-    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@6c72e3dbc894744c1e228fb165f4c4d657e475b6 # v1.0.1
+    uses: zama-ai/ci-templates/.github/workflows/common-docker.yml@3cf4c2b133947d29e7a313555638621f9ca0345c # v1.0.3
     secrets:
       AWS_ACCESS_KEY_S3_USER: ${{ secrets.AWS_ACCESS_KEY_S3_USER }}
       AWS_SECRET_KEY_S3_USER: ${{ secrets.AWS_SECRET_KEY_S3_USER }}
diff --git a/golden-container-images/rust-glibc/Dockerfile b/golden-container-images/rust-glibc/Dockerfile
index f95f3655e1..b450a9f346 100644
--- a/golden-container-images/rust-glibc/Dockerfile
+++ b/golden-container-images/rust-glibc/Dockerfile
@@ -1,6 +1,6 @@
 FROM cgr.dev/zama.ai/glibc-dynamic:15.2.0-dev AS prod
 
-ARG RUST_IMAGE_VERSION=1.91.0
+ARG RUST_IMAGE_VERSION
 
 USER root
 
diff --git a/kms-connector/connector-db/Dockerfile b/kms-connector/connector-db/Dockerfile
index 576605e03c..b496aeb9c0 100644
--- a/kms-connector/connector-db/Dockerfile
+++ b/kms-connector/connector-db/Dockerfile
@@ -1,5 +1,4 @@
-# RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.87.0
+ARG RUST_IMAGE_VERSION
 
 # Stage 1: install DB Migration tooling
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
diff --git a/kms-connector/crates/gw-listener/Dockerfile b/kms-connector/crates/gw-listener/Dockerfile
index b452cb6a30..2351e5f057 100644
--- a/kms-connector/crates/gw-listener/Dockerfile
+++ b/kms-connector/crates/gw-listener/Dockerfile
@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1
 
-# RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.91.0
+ARG RUST_IMAGE_VERSION
 
 # Stage 1: Build gw-listener
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
diff --git a/kms-connector/crates/kms-worker/Dockerfile b/kms-connector/crates/kms-worker/Dockerfile
index 8a7408c652..fdc50c6524 100644
--- a/kms-connector/crates/kms-worker/Dockerfile
+++ b/kms-connector/crates/kms-worker/Dockerfile
@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1
 
-# RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.91.0
+ARG RUST_IMAGE_VERSION
 
 # Stage 1: Build kms-worker
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
diff --git a/kms-connector/crates/tx-sender/Dockerfile b/kms-connector/crates/tx-sender/Dockerfile
index 3d8ba609e6..e259a6cffc 100644
--- a/kms-connector/crates/tx-sender/Dockerfile
+++ b/kms-connector/crates/tx-sender/Dockerfile
@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1
 
-# RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.91.0
+ARG RUST_IMAGE_VERSION
 
 # Stage 1: Build tx-sender
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
diff --git a/test-suite/gateway-stress/Dockerfile b/test-suite/gateway-stress/Dockerfile
index 2b6f4bbae8..1042217e67 100644
--- a/test-suite/gateway-stress/Dockerfile
+++ b/test-suite/gateway-stress/Dockerfile
@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1
 
-# RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.91.0
+ARG RUST_IMAGE_VERSION
 
 # Stage 1: Build gateway-stress tool
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
diff --git a/test-suite/gateway-stress/rust-toolchain.toml b/test-suite/gateway-stress/rust-toolchain.toml
new file mode 100644
index 0000000000..d72668b05a
--- /dev/null
+++ b/test-suite/gateway-stress/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.91.0"
diff --git a/toolchain.txt b/toolchain.txt
deleted file mode 100644
index 6979a6c066..0000000000
--- a/toolchain.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.91.0