diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index dc22c9057fa66..0dc1ea876851b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -37,12 +37,6 @@ updates:
       patterns:
         - "google-cloud*"
 # Don't update these directories
-- package-ecosystem: cargo
-  directory: /src/workspace-hack
-  schedule:
-    interval: "daily"
-  ignore:
-    - dependency-name: "*"
 - package-ecosystem: cargo
   directory: /integration_tests/feature-store
   schedule:
diff --git a/.github/workflows/hakari_fix.yml b/.github/workflows/hakari_fix.yml
deleted file mode 100644
index b8ded582c36e9..0000000000000
--- a/.github/workflows/hakari_fix.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Hakari Fix
-
-on:
-  pull_request:
-    types: ["opened", "synchronize"]
-    paths: ["Cargo.lock", "**/Cargo.toml"]
-
-jobs:
-  hakari-fix:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Install cargo-hakari
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-hakari
-
-      - name: Hakari generate
-        run: cargo hakari generate
-
-      - name: Show diff
-        run: git diff
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Fix "cargo-hakari"
diff --git a/Cargo.lock b/Cargo.lock
index fcb2e7a20db6d..6135ee839bfe7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10256,6 +10256,7 @@ dependencies = [
  "async-trait",
  "await-tree",
  "aws-config",
+ "aws-credential-types",
  "aws-smithy-http",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -14646,147 +14647,6 @@ dependencies = [
 [[package]]
 name = "workspace-hack"
 version = "1.7.0-alpha"
-dependencies = [
- "ahash 0.8.6",
- "aho-corasick",
- "allocator-api2",
- "anyhow",
- "async-std",
- "auto_enums",
- "aws-credential-types",
- "aws-runtime",
- "aws-sdk-s3",
- "aws-sigv4",
- "aws-smithy-runtime",
- "aws-smithy-types",
- "base64 0.21.7",
- "bigdecimal 0.4.2",
- "bit-vec",
- "bitflags 2.5.0",
- "byteorder",
- "bytes",
- "cc",
- "chrono",
- "clap",
- "clap_builder",
- "combine",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
- "crypto-bigint 0.5.5",
- "deranged",
- "digest",
- "either",
- "fail",
- "flate2",
- "frunk_core",
- "futures",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
- "generic-array",
- "governor",
- "hashbrown 0.13.2",
- "hashbrown 0.14.3",
- "hmac",
- "hyper 0.14.27",
- "indexmap 1.9.3",
- "indexmap 2.0.0",
- "itertools 0.11.0",
- "jni",
- "lazy_static",
- "lexical-core",
- "lexical-parse-float",
- "lexical-parse-integer",
- "lexical-util",
- "lexical-write-float",
- "lexical-write-integer",
- "libc",
- "lock_api",
- "log",
- "madsim-rdkafka",
- "madsim-tokio",
- "md-5",
- "memchr",
- "mio",
- "moka",
- "nom",
- "num-bigint",
- "num-integer",
- "num-iter",
- "num-traits",
- "openssl",
- "openssl-sys",
- "ordered-float 3.9.1",
- "parking_lot 0.12.1",
- "parking_lot_core 0.9.8",
- "petgraph",
- "phf",
- "phf_shared",
- "postgres-types",
- "proc-macro2",
- "prometheus",
- "prost 0.12.1",
- "prost-types 0.12.1",
- "quote",
- "rand",
- "rand_chacha",
- "rand_core",
- "redis",
- "regex",
- "regex-automata 0.4.5",
- "regex-syntax 0.8.2",
- "reqwest 0.11.20",
- "reqwest 0.12.2",
- "ring 0.16.20",
- "rust_decimal",
- "rustc-hash",
- "scopeguard",
- "sea-orm",
- "sea-query",
- "sea-query-binder",
- "serde",
- "serde_json",
- "serde_with",
- "sha1",
- "sha2",
- "smallvec",
- "socket2 0.5.6",
- "sqlx",
- "sqlx-core",
- "sqlx-mysql",
- "sqlx-postgres",
- "sqlx-sqlite",
- "strum 0.25.0",
- "strum 0.26.1",
- "subtle",
- "syn 1.0.109",
- "syn 2.0.57",
- "target-lexicon",
- "time",
- "time-macros",
- "tinyvec",
- "tokio",
- "tokio-postgres",
- "tokio-stream",
- "tokio-util",
- "toml_datetime",
- "tonic 0.10.2",
- "tower",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
- "unicode-bidi",
- "unicode-normalization",
- "url",
- "uuid",
- "whoami",
- "zeroize",
-]
 
 [[package]]
 name = "wyz"
diff --git a/Makefile.toml b/Makefile.toml
index ba11c4910fc7e..ec2b54cd5d64c 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -1180,7 +1180,8 @@ scripts/check/check-trailing-spaces.sh --fix
 category = "RiseDev - Check"
 dependencies = [
   "warn-on-missing-tools",
-  "check-hakari",
+  # Disable hakari until we make sure it's useful
+  # "check-hakari",
   "check-dep-sort",
   "check-fmt",
   "check-trailing-spaces",
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index b631ed5425390..ac02b99d1688c 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -30,9 +30,10 @@ fi
 echo "--- Rust cargo-sort check"
 cargo sort --check --workspace --grouped
 
-echo "--- Rust cargo-hakari check"
-cargo hakari generate --diff
-cargo hakari verify
+# Disable hakari until we make sure it's useful
+# echo "--- Rust cargo-hakari check"
+# cargo hakari generate --diff
+# cargo hakari verify
 
 echo "--- Rust format check"
 cargo fmt --all -- --check
diff --git a/src/jni_core/Cargo.toml b/src/jni_core/Cargo.toml
index 6c946dedfabc0..b8ed54460025b 100644
--- a/src/jni_core/Cargo.toml
+++ b/src/jni_core/Cargo.toml
@@ -17,7 +17,7 @@ chrono = { version = "0.4", default-features = false }
 fs-err = "2"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 itertools = "0.12"
-jni = "0.21.1"
+jni = { version = "0.21.1", features = ["invocation"] }
 paste = "1"
 prost = { workspace = true }
 risingwave_common = { workspace = true }
diff --git a/src/meta/src/barrier/rpc.rs b/src/meta/src/barrier/rpc.rs
index f8c46ea795b70..3484d2ff6942f 100644
--- a/src/meta/src/barrier/rpc.rs
+++ b/src/meta/src/barrier/rpc.rs
@@ -23,7 +23,6 @@ use futures::future::try_join_all;
 use futures::stream::{BoxStream, FuturesUnordered};
 use futures::{pin_mut, FutureExt, StreamExt};
 use itertools::Itertools;
-use risingwave_common::bail;
 use risingwave_common::hash::ActorId;
 use risingwave_common::util::tracing::TracingContext;
 use risingwave_pb::common::{ActorInfo, WorkerNode};
@@ -213,7 +212,9 @@ impl ControlStreamManager {
         &mut self,
         command_context: Arc<CommandContext>,
     ) -> MetaResult<HashSet<WorkerId>> {
-        fail_point!("inject_barrier_err", |_| bail!("inject_barrier_err"));
+        fail_point!("inject_barrier_err", |_| risingwave_common::bail!(
+            "inject_barrier_err"
+        ));
         let mutation = command_context.to_mutation();
         let info = command_context.info.clone();
         let mut node_need_collect = HashSet::new();
diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml
index 61b5741f3918d..7147144cda49a 100644
--- a/src/object_store/Cargo.toml
+++ b/src/object_store/Cargo.toml
@@ -12,6 +12,7 @@ repository = { workspace = true }
 async-trait = "0.1"
 await-tree = { workspace = true }
 aws-config = { workspace = true }
+aws-credential-types = { workspace = true }
 aws-sdk-s3 = { version = "0.5", package = "madsim-aws-sdk-s3" }
 aws-smithy-http = { workspace = true }
 aws-smithy-runtime = { workspace = true }
diff --git a/src/prost/Cargo.toml b/src/prost/Cargo.toml
index af12b1683959c..af980fb65925d 100644
--- a/src/prost/Cargo.toml
+++ b/src/prost/Cargo.toml
@@ -14,7 +14,7 @@ prost = { workspace = true }
 prost-helpers = { path = "helpers" }
 risingwave_error = { workspace = true }
 serde = { version = "1", features = ["derive"] }
-strum = "0.26"
+strum = { version = "0.26", features = ["derive"] }
 thiserror = "1"
 tonic = { workspace = true }
 
diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
index c350759f1a1c8..597a16e6658db 100644
--- a/src/workspace-hack/Cargo.toml
+++ b/src/workspace-hack/Cargo.toml
@@ -17,196 +17,8 @@ publish = false
 # are managed by hakari.
 
 ### BEGIN HAKARI SECTION
-[dependencies]
-ahash = { version = "0.8" }
-aho-corasick = { version = "1" }
-allocator-api2 = { version = "0.2", default-features = false, features = ["alloc", "nightly"] }
-anyhow = { version = "1", features = ["backtrace"] }
-async-std = { version = "1", features = ["attributes", "tokio1"] }
-aws-credential-types = { version = "1", default-features = false, features = ["hardcoded-credentials"] }
-aws-runtime = { version = "1", default-features = false, features = ["event-stream", "sigv4a"] }
-aws-sdk-s3 = { version = "1" }
-aws-sigv4 = { version = "1", features = ["http0-compat", "sign-eventstream", "sigv4a"] }
-aws-smithy-runtime = { version = "1", default-features = false, features = ["client", "rt-tokio", "tls-rustls"] }
-aws-smithy-types = { version = "1", default-features = false, features = ["byte-stream-poll-next", "http-body-0-4-x", "hyper-0-14-x", "rt-tokio"] }
-base64 = { version = "0.21" }
-bigdecimal = { version = "0.4" }
-bit-vec = { version = "0.6" }
-bitflags = { version = "2", default-features = false, features = ["serde", "std"] }
-byteorder = { version = "1" }
-bytes = { version = "1", features = ["serde"] }
-chrono = { version = "0.4", features = ["serde"] }
-clap = { version = "4", features = ["cargo", "derive", "env"] }
-clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "env", "help", "std", "suggestions", "usage"] }
-combine = { version = "4", features = ["tokio"] }
-crossbeam-epoch = { version = "0.9" }
-crossbeam-queue = { version = "0.3" }
-crossbeam-utils = { version = "0.8" }
-crypto-bigint = { version = "0.5", features = ["generic-array", "zeroize"] }
-deranged = { version = "0.3", default-features = false, features = ["powerfmt", "serde", "std"] }
-digest = { version = "0.10", features = ["mac", "oid", "std"] }
-either = { version = "1", features = ["serde"] }
-fail = { version = "0.5", default-features = false, features = ["failpoints"] }
-flate2 = { version = "1", features = ["zlib"] }
-frunk_core = { version = "0.4", default-features = false, features = ["std"] }
-futures = { version = "0.3" }
-futures-channel = { version = "0.3", features = ["sink"] }
-futures-core = { version = "0.3" }
-futures-executor = { version = "0.3" }
-futures-io = { version = "0.3" }
-futures-sink = { version = "0.3" }
-futures-task = { version = "0.3" }
-futures-util = { version = "0.3", features = ["channel", "io", "sink"] }
-generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] }
-governor = { version = "0.6", default-features = false, features = ["dashmap", "jitter", "std"] }
-hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", features = ["nightly", "raw"] }
-hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13", features = ["raw"] }
-hmac = { version = "0.12", default-features = false, features = ["reset"] }
-hyper = { version = "0.14", features = ["full"] }
-indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1", default-features = false, features = ["serde"] }
-indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2", features = ["serde"] }
-itertools = { version = "0.11" }
-jni = { version = "0.21", features = ["invocation"] }
-lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
-lexical-core = { version = "0.8", features = ["format"] }
-lexical-parse-float = { version = "0.8", default-features = false, features = ["format", "std"] }
-lexical-parse-integer = { version = "0.8", default-features = false, features = ["format", "std"] }
-lexical-util = { version = "0.8", default-features = false, features = ["format", "parse-floats", "parse-integers", "std", "write-floats", "write-integers"] }
-lexical-write-float = { version = "0.8", default-features = false, features = ["format", "std"] }
-lexical-write-integer = { version = "0.8", default-features = false, features = ["format", "std"] }
-libc = { version = "0.2", features = ["extra_traits"] }
-lock_api = { version = "0.4", features = ["arc_lock"] }
-log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] }
-madsim-rdkafka = { version = "0.3", features = ["cmake-build", "gssapi", "ssl-vendored", "zstd"] }
-madsim-tokio = { version = "0.2", default-features = false, features = ["fs", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "signal", "sync", "time", "tracing"] }
-md-5 = { version = "0.10" }
-memchr = { version = "2" }
-mio = { version = "0.8", features = ["net", "os-ext"] }
-moka = { version = "0.12", features = ["future", "sync"] }
-nom = { version = "7" }
-num-bigint = { version = "0.4" }
-num-integer = { version = "0.1", features = ["i128"] }
-num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }
-num-traits = { version = "0.2", features = ["i128", "libm"] }
-openssl = { version = "0.10", features = ["vendored"] }
-openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
-ordered-float = { version = "3" }
-parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] }
-parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] }
-petgraph = { version = "0.6" }
-phf = { version = "0.11", features = ["uncased"] }
-phf_shared = { version = "0.11", features = ["uncased"] }
-postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
-proc-macro2 = { version = "1", features = ["span-locations"] }
-prometheus = { version = "0.13", features = ["process"] }
-prost = { version = "0.12", features = ["no-recursion-limit"] }
-prost-types = { version = "0.12" }
-quote = { version = "1" }
-rand = { version = "0.8", features = ["small_rng"] }
-rand_chacha = { version = "0.3" }
-rand_core = { version = "0.6", default-features = false, features = ["std"] }
-redis = { version = "0.25", features = ["async-std-comp", "tokio-comp"] }
-regex = { version = "1" }
-regex-automata = { version = "0.4", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
-regex-syntax = { version = "0.8" }
-reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12", features = ["blocking", "json"] }
-reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11", default-features = false, features = ["blocking", "default-tls", "json", "rustls-tls"] }
-ring = { version = "0.16", features = ["std"] }
-rust_decimal = { version = "1", features = ["db-postgres", "maths"] }
-rustc-hash = { version = "1" }
-scopeguard = { version = "1" }
-sea-orm = { version = "0.12", features = ["runtime-tokio-native-tls", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite"] }
-sea-query = { version = "0.30", default-features = false, features = ["backend-mysql", "backend-postgres", "backend-sqlite", "derive", "hashable-value", "postgres-array", "thread-safe", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] }
-sea-query-binder = { version = "0.5", default-features = false, features = ["postgres-array", "runtime-tokio-native-tls", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] }
-serde = { version = "1", features = ["alloc", "derive", "rc"] }
-serde_json = { version = "1", features = ["alloc", "raw_value"] }
-serde_with = { version = "3", features = ["json"] }
-sha1 = { version = "0.10" }
-sha2 = { version = "0.10", features = ["oid"] }
-smallvec = { version = "1", default-features = false, features = ["const_new", "serde", "union", "write"] }
-socket2 = { version = "0.5", default-features = false, features = ["all"] }
-sqlx = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "mysql", "postgres", "runtime-tokio-native-tls", "rust_decimal", "sqlite", "time", "uuid"] }
-sqlx-core = { version = "0.7", features = ["_rt-tokio", "_tls-native-tls", "bigdecimal", "chrono", "json", "migrate", "offline", "rust_decimal", "time", "uuid"] }
-sqlx-mysql = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "rust_decimal", "time", "uuid"] }
-sqlx-postgres = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "rust_decimal", "time", "uuid"] }
-sqlx-sqlite = { version = "0.7", default-features = false, features = ["chrono", "json", "time", "uuid"] }
-strum-2f80eeee3b1b6c7e = { package = "strum", version = "0.26", features = ["derive"] }
-strum-2ffb4c3fe830441c = { package = "strum", version = "0.25", features = ["derive"] }
-subtle = { version = "2" }
-syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] }
-target-lexicon = { version = "0.12", features = ["std"] }
-time = { version = "0.3", features = ["local-offset", "macros", "serde-well-known"] }
-tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] }
-tokio = { version = "1", features = ["full", "test-util", "tracing"] }
-tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88", features = ["with-chrono-0_4", "with-uuid-1"] }
-tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] }
-tokio-util = { version = "0.7", features = ["codec", "io"] }
-toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
-tonic = { version = "0.10", features = ["gzip", "tls-webpki-roots"] }
-tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "timeout", "util"] }
-tracing = { version = "0.1", features = ["log"] }
-tracing-core = { version = "0.1" }
-tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "local-time", "parking_lot"] }
-unicode-bidi = { version = "0.3" }
-unicode-normalization = { version = "0.1" }
-url = { version = "2", features = ["serde"] }
-uuid = { version = "1", features = ["fast-rng", "serde", "v4"] }
-whoami = { version = "1" }
-zeroize = { version = "1" }
-
-[build-dependencies]
-ahash = { version = "0.8" }
-aho-corasick = { version = "1" }
-allocator-api2 = { version = "0.2", default-features = false, features = ["alloc", "nightly"] }
-anyhow = { version = "1", features = ["backtrace"] }
-auto_enums = { version = "0.8", features = ["futures03", "tokio1"] }
-bitflags = { version = "2", default-features = false, features = ["serde", "std"] }
-bytes = { version = "1", features = ["serde"] }
-cc = { version = "1", default-features = false, features = ["parallel"] }
-crossbeam-epoch = { version = "0.9" }
-crossbeam-queue = { version = "0.3" }
-crossbeam-utils = { version = "0.8" }
-deranged = { version = "0.3", default-features = false, features = ["powerfmt", "serde", "std"] }
-digest = { version = "0.10", features = ["mac", "oid", "std"] }
-either = { version = "1", features = ["serde"] }
-frunk_core = { version = "0.4", default-features = false, features = ["std"] }
-generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] }
-hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", features = ["nightly", "raw"] }
-indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2", features = ["serde"] }
-itertools = { version = "0.11" }
-lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
-libc = { version = "0.2", features = ["extra_traits"] }
-log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] }
-memchr = { version = "2" }
-nom = { version = "7" }
-num-bigint = { version = "0.4" }
-num-integer = { version = "0.1", features = ["i128"] }
-num-traits = { version = "0.2", features = ["i128", "libm"] }
-petgraph = { version = "0.6" }
-phf = { version = "0.11", features = ["uncased"] }
-phf_shared = { version = "0.11", features = ["uncased"] }
-proc-macro2 = { version = "1", features = ["span-locations"] }
-prost = { version = "0.12", features = ["no-recursion-limit"] }
-prost-types = { version = "0.12" }
-quote = { version = "1" }
-rand = { version = "0.8", features = ["small_rng"] }
-rand_chacha = { version = "0.3" }
-rand_core = { version = "0.6", default-features = false, features = ["std"] }
-regex = { version = "1" }
-regex-automata = { version = "0.4", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
-regex-syntax = { version = "0.8" }
-rustc-hash = { version = "1" }
-scopeguard = { version = "1" }
-serde = { version = "1", features = ["alloc", "derive", "rc"] }
-serde_json = { version = "1", features = ["alloc", "raw_value"] }
-sha2 = { version = "0.10", features = ["oid"] }
-subtle = { version = "2" }
-syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] }
-syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
-target-lexicon = { version = "0.12", features = ["std"] }
-time = { version = "0.3", features = ["local-offset", "macros", "serde-well-known"] }
-time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing", "serde"] }
-toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
-zeroize = { version = "1" }
 
+# Disabled by running `cargo hakari disable`.
+# To re-enable, run:
+#     cargo hakari generate
 ### END HAKARI SECTION