diff --git a/.github/workflows/runas.yml b/.github/workflows/runas.yml
index 527933855..a3f7aa776 100644
--- a/.github/workflows/runas.yml
+++ b/.github/workflows/runas.yml
@@ -86,6 +86,11 @@ jobs:
           cargo --version
           pg_config --version
 
+      - name: Install rustfmt & clippy
+        run: |
+          rustup component add rustfmt
+          rustup component add clippy
+
       - name: Install cargo pgrx
         run: cd cargo-pgrx && cargo install --path . --debug
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5bd2f57ed..4c47e50de 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -74,6 +74,11 @@ jobs:
       - name: Print sccache stats (before)
         run: sccache --show-stats
 
+      - name: Install rustfmt & clippy
+        run: |
+          rustup component add rustfmt
+          rustup component add clippy
+
       - name: Run rustfmt
         run: cargo fmt --all -- --check
 
@@ -219,6 +224,11 @@ jobs:
       - name: Print sccache stats (before run)
         run: sccache --show-stats
 
+      - name: Install rustfmt & clippy
+        run: |
+          rustup component add rustfmt
+          rustup component add clippy
+
       - name: Install cargo-pgrx
         run: cargo install --path cargo-pgrx/ --debug --force
 
@@ -374,6 +384,11 @@ jobs:
       - name: Print sccache stats (before)
         run: sccache --show-stats
 
+      - name: Install rustfmt & clippy
+        run: |
+          rustup component add rustfmt
+          rustup component add clippy
+
       - name: Install cargo-pgrx
         run: cargo install --path cargo-pgrx/ --debug --force
 
@@ -495,6 +510,11 @@ jobs:
       - name: Print sccache stats
         run: sccache --show-stats
 
+      - name: Install rustfmt & clippy
+        run: |
+          rustup component add rustfmt
+          rustup component add clippy
+
       - name: Install cargo-pgrx
         run: cargo install --path cargo-pgrx/ --debug --force
 
@@ -575,6 +595,11 @@ jobs:
       - name: Install cargo-pgrx
         run: cargo install --path cargo-pgrx/ --debug --force
 
+      - name: Install rustfmt & clippy
+        run: |
+          rustup component add rustfmt
+          rustup component add clippy
+
       - name: Print sccache stats
         run: sccache --show-stats
 
diff --git a/Cargo.lock b/Cargo.lock
index 03b0801dc..856995641 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1934,6 +1934,7 @@ dependencies = [
  "bitvec",
  "enum-map",
  "libc",
+ "once_cell",
  "pgrx-macros",
  "pgrx-pg-sys",
  "pgrx-sql-entity-graph",
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..b67e7d534
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.89.0"