diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 659b109f..0fcd4b77 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -24,12 +24,17 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      
+      - name: Retrieve Rust version
+        id: rust-version
+        run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
+        shell: bash
 
       - name: Set up rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: "clippy, rustfmt"
-          toolchain: 1.83
+          toolchain: ${{ steps.rust-version.outputs.rust-version }}
 
       - name: Add wasm32-wasi target
         run: rustup target add wasm32-wasip1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 648bf160..3be6ecfe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,10 +24,15 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Retrieve Rust version
+        id: rust-version
+        run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
+        shell: bash
+
       - name: Set up Rust tool chain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.83
+          toolchain: ${{ steps.rust-version.outputs.rust-version }}
 
       - name: Add wasm32-wasi target
         run: rustup target add wasm32-wasip1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdd27bec..fb565600 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,9 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.0.6] - Scheduled
 
 ### Changed
--  Remove hard coded Fast ID in fastly.tom
--  Updated README to better describe what Trusted Server does and high-level goal
-
+- Remove hard coded Fast ID in fastly.tom
+- Updated README to better describe what Trusted Server does and high-level goal
+- Use Rust toolchain version from .tool-versions for GitHub actions 
 
 ## [1.0.5] - 2025-05-19