diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d6ee154a..9a2ab172 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,10 +12,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-          components: 'rustfmt, clippy'
 
       # cargo publish
       - name: publish crates
diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
index 293ae0ed..14f10865 100644
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -28,9 +28,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
           target: ${{ matrix.target }}
-          components: 'rustfmt, clippy'
 
       # download libduckdb
       - uses: robinraju/release-downloader@v1.4
@@ -112,7 +110,6 @@ jobs:
             index-${{ runner.os }}-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
           target: x86_64-pc-windows-msvc
 
       - run: cargo install cargo-examples
@@ -154,4 +151,4 @@ jobs:
           path: './'
           args: --allow-dirty --all-features
           dry-run: true
-          ignore-unpublished-changes: true
\ No newline at end of file
+          ignore-unpublished-changes: true
diff --git a/.rustfmt.toml b/.rustfmt.toml
deleted file mode 100644
index 5baafd61..00000000
--- a/.rustfmt.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-max_width = 120
-imports_granularity = "Crate"
-reorder_imports = true
-fn_call_width = 72
-# indent_style = "Block"
-# tab_spaces = 2
-# group_imports="StdExternalCrate"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..88db1f69
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.87"
+components = ["rustfmt", "clippy"]
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000..01b441c0
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,2 @@
+max_width = 120
+edition = "2021"