diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml
index ec55fe7..bdc3ddf 100644
--- a/.github/workflows/pr_pre-commit.yaml
+++ b/.github/workflows/pr_pre-commit.yaml
@@ -6,7 +6,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_TOOLCHAIN_VERSION: "1.82.0"
+  RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
   HADOLINT_VERSION: "v2.12.0"
   PYTHON_VERSION: "3.12"
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a36fdcb..c5bd8ad 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,10 +17,6 @@ repos:
   - repo: https://github.com/doublify/pre-commit-rust
     rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
     hooks:
-      - id: fmt
-        # Pinning to a specific rustc version, so that we get consistent formatting
-        entry: RUSTUP_TOOLCHAIN=nightly-2025-01-15 cargo fmt
-        args: ["--all", "--", "--check"]
       - id: clippy
         args: ["--all-targets", "--", "-D", "warnings"]
 
@@ -78,3 +74,10 @@ repos:
         entry: cargo test
         stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false
+
+      - id: cargo-rustfmt
+        name: cargo-rustfmt
+        language: system
+        entry: cargo +nightly-2025-01-15 fmt --all -- --check
+        stages: [pre-commit]
+        pass_filenames: false
diff --git a/rust/operator-binary/src/csi_server/controller.rs b/rust/operator-binary/src/csi_server/controller.rs
index c14961e..0edfaee 100644
--- a/rust/operator-binary/src/csi_server/controller.rs
+++ b/rust/operator-binary/src/csi_server/controller.rs
@@ -8,9 +8,8 @@ use stackable_operator::{
 };
 use tonic::{Request, Response, Status};
 
-use crate::utils::error::error_full_message;
-
 use super::{tonic_unimplemented, ListenerSelector, ListenerVolumeContext};
+use crate::utils::error::error_full_message;
 
 pub struct ListenerOperatorController {
     pub client: stackable_operator::client::Client,
diff --git a/rust/operator-binary/src/csi_server/node.rs b/rust/operator-binary/src/csi_server/node.rs
index fe85dd5..6715948 100644
--- a/rust/operator-binary/src/csi_server/node.rs
+++ b/rust/operator-binary/src/csi_server/node.rs
@@ -1,3 +1,5 @@
+use std::{fmt::Debug, path::PathBuf};
+
 use csi_grpc::{self as csi, v1::Topology};
 use serde::{de::IntoDeserializer, Deserialize};
 use snafu::{OptionExt, ResultExt, Snafu};
@@ -13,9 +15,9 @@ use stackable_operator::{
         runtime::reflector::ObjectRef,
     },
 };
-use std::{fmt::Debug, path::PathBuf};
 use tonic::{Request, Response, Status};
 
+use super::{tonic_unimplemented, ListenerSelector, ListenerVolumeContext};
 use crate::{
     listener_controller::{
         listener_mounted_pod_label, listener_persistent_volume_label, ListenerMountedPodLabelError,
@@ -24,8 +26,6 @@ use crate::{
     utils::{address::node_primary_addresses, error::error_full_message},
 };
 
-use super::{tonic_unimplemented, ListenerSelector, ListenerVolumeContext};
-
 const FIELD_MANAGER_SCOPE: &str = "volume";
 
 pub const NODE_TOPOLOGY_LABEL_HOSTNAME: &str = "listeners.stackable.tech/hostname";
diff --git a/rust/operator-binary/src/listener_controller.rs b/rust/operator-binary/src/listener_controller.rs
index 0c8988b..c88aeed 100644
--- a/rust/operator-binary/src/listener_controller.rs
+++ b/rust/operator-binary/src/listener_controller.rs
@@ -9,6 +9,8 @@ use futures::{
     StreamExt,
 };
 use snafu::{OptionExt, ResultExt, Snafu};
+#[cfg(doc)]
+use stackable_operator::k8s_openapi::api::core::v1::Pod;
 use stackable_operator::{
     builder::meta::ObjectMetaBuilder,
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
@@ -44,9 +46,6 @@ use crate::{
     APP_NAME, OPERATOR_KEY,
 };
 
-#[cfg(doc)]
-use stackable_operator::k8s_openapi::api::core::v1::Pod;
-
 const OPERATOR_NAME: &str = "listeners.stackable.tech";
 const CONTROLLER_NAME: &str = "listener";
 pub const FULL_CONTROLLER_NAME: &str = concatcp!(CONTROLLER_NAME, '.', OPERATOR_NAME);