diff --git a/ci/rust-toolchain b/ci/rust-toolchain
index 1344210e6b768..6bc57a2a65d8f 100644
--- a/ci/rust-toolchain
+++ b/ci/rust-toolchain
@@ -4,4 +4,4 @@
 # 3. (optional) **follow the instructions in lints/README.md** to update the toolchain and dependencies for lints
 
 [toolchain]
-channel = "nightly-2024-06-12"
+channel = "nightly-2024-06-06"
diff --git a/lints/Cargo.lock b/lints/Cargo.lock
index 650509dca25b7..e3b748e6da670 100644
--- a/lints/Cargo.lock
+++ b/lints/Cargo.lock
@@ -163,7 +163,6 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "clippy_config"
 version = "0.1.80"
-source = "git+https://github.com/rust-lang/rust-clippy?rev=35f54fd439432f56c749fbb34f1326e34ed1fc42#35f54fd439432f56c749fbb34f1326e34ed1fc42"
 dependencies = [
  "rustc-semver",
  "serde",
@@ -173,7 +172,6 @@ dependencies = [
 [[package]]
 name = "clippy_utils"
 version = "0.1.80"
-source = "git+https://github.com/rust-lang/rust-clippy?rev=35f54fd439432f56c749fbb34f1326e34ed1fc42#35f54fd439432f56c749fbb34f1326e34ed1fc42"
 dependencies = [
  "arrayvec",
  "clippy_config",
diff --git a/lints/Cargo.toml b/lints/Cargo.toml
index 23fd63617dcd2..43ece1f6fc5b7 100644
--- a/lints/Cargo.toml
+++ b/lints/Cargo.toml
@@ -14,7 +14,7 @@ path = "ui/format_error.rs"
 # See `README.md` before bumping the version.
 # Remember to update the version in `ci/Dockerfile` as well.
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "35f54fd439432f56c749fbb34f1326e34ed1fc42" }
+clippy_utils = { git = "https://github.com/risingwavelabs/clippy", rev = "5e2a7c6adebdb0478ee6d5b67ab4ee94153b2997" }
 dylint_linting = "3.1.0"
 itertools = "0.12"
 
diff --git a/lints/rust-toolchain b/lints/rust-toolchain
index 0c3f355be78e3..a146af66cd637 100644
--- a/lints/rust-toolchain
+++ b/lints/rust-toolchain
@@ -1,5 +1,5 @@
 # See `README.md` before bumping the version.
 
 [toolchain]
-channel = "nightly-2024-06-12"
+channel = "nightly-2024-06-06"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs b/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs
index 463b1f3c9dbd4..d85d712c41ac3 100644
--- a/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs
+++ b/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs
@@ -27,6 +27,7 @@ pub struct MonitoredFanoutPartitionedWriterBuilder<B: IcebergWriterBuilder> {
 }
 
 impl<B: IcebergWriterBuilder> MonitoredFanoutPartitionedWriterBuilder<B> {
+    #[expect(dead_code)]
     pub fn new(
         inner: FanoutPartitionedWriterBuilder<B>,
         partition_num: LabelGuardedIntGauge<2>,
diff --git a/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs b/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs
index aebb5939ff143..dc44434e5d9c2 100644
--- a/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs
+++ b/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs
@@ -28,6 +28,7 @@ pub struct MonitoredWriteWriterBuilder<B: IcebergWriterBuilder> {
 
 impl<B: IcebergWriterBuilder> MonitoredWriteWriterBuilder<B> {
     /// Create writer context.
+    #[expect(dead_code)]
     pub fn new(
         inner: B,
         write_qps: LabelGuardedIntCounter<2>,
diff --git a/src/stream/src/executor/nested_loop_temporal_join.rs b/src/stream/src/executor/nested_loop_temporal_join.rs
index 1cbeba9560a9c..0888d8981fc8c 100644
--- a/src/stream/src/executor/nested_loop_temporal_join.rs
+++ b/src/stream/src/executor/nested_loop_temporal_join.rs
@@ -99,6 +99,7 @@ async fn phase1_handle_chunk<S: StateStore, E: phase1::Phase1Evaluation>(
 
 impl<S: StateStore, const T: JoinTypePrimitive> NestedLoopTemporalJoinExecutor<S, T> {
     #[allow(clippy::too_many_arguments)]
+    #[expect(dead_code)]
     pub fn new(
         ctx: ActorContextRef,
         info: ExecutorInfo,