diff --git a/Formula/tezos-accuser-PsParisC.rb b/Formula/tezos-accuser-PsParisC.rb
index cf63df984..671dc8472 100644
--- a/Formula/tezos-accuser-PsParisC.rb
+++ b/Formula/tezos-accuser-PsParisC.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsparisc.version}/"
+    sha256 cellar: :any, ventura: "ff4915ff88ee6262d38bb32dc5bf82d75d0dd4d4be8121e56909b8bae3e7b0c9"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-accuser-PsQuebec.rb b/Formula/tezos-accuser-PsQuebec.rb
index bb8f0b6a3..fcc771e8d 100644
--- a/Formula/tezos-accuser-PsQuebec.rb
+++ b/Formula/tezos-accuser-PsQuebec.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsquebec.version}/"
+    sha256 cellar: :any, ventura: "fddcccb61dccb1bb3d1d9eb145aa52ab2dbff6955e8aba89411063f3e554c3bf"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb
index 6b8ba29d0..268b97459 100644
--- a/Formula/tezos-admin-client.rb
+++ b/Formula/tezos-admin-client.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
+    sha256 cellar: :any, ventura: "0c2004a9c4547721f7ad6b5fe56b32a1467424bfdbff94fe5e808f4d23897a8d"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-baker-PsParisC.rb b/Formula/tezos-baker-PsParisC.rb
index ff9b308a8..b527cd8c0 100644
--- a/Formula/tezos-baker-PsParisC.rb
+++ b/Formula/tezos-baker-PsParisC.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsparisc.version}/"
+    sha256 cellar: :any, ventura: "014069ca270d7eb061ab472c98c4051641058f9dbad68e889b91ca100db5a96e"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-baker-PsQuebec.rb b/Formula/tezos-baker-PsQuebec.rb
index df50f80d7..b1e520ff1 100644
--- a/Formula/tezos-baker-PsQuebec.rb
+++ b/Formula/tezos-baker-PsQuebec.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsquebec.version}/"
+    sha256 cellar: :any, ventura: "36ceae5db82e9cdcd871c7c91064c9118071d68819727a0abf9880c5be470115"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb
index 7bf2b5d53..ed50095f4 100644
--- a/Formula/tezos-client.rb
+++ b/Formula/tezos-client.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
+    sha256 cellar: :any, ventura: "430e086d9d811a57de3a0737553328adf0ca10f37e7a27a9240132b233b5afff"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb
index d0aa3050e..e2b7d4327 100644
--- a/Formula/tezos-codec.rb
+++ b/Formula/tezos-codec.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
+    sha256 cellar: :any, ventura: "a7485e50296716803174db2efb2e7f21fcbad27f08e798837ce70e64897ff1df"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb
index e40d30169..8115e7335 100644
--- a/Formula/tezos-dac-client.rb
+++ b/Formula/tezos-dac-client.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/"
+    sha256 cellar: :any, ventura: "36a484535720dcfa91a1fa132ecbace1221740b980fbc5125295d022c7461491"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb
index cdb77739d..e8a3da37b 100644
--- a/Formula/tezos-dac-node.rb
+++ b/Formula/tezos-dac-node.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/"
+    sha256 cellar: :any, ventura: "f0e2d650f8742e0ac4293ba232d266e77bfc840b0485848fe2b6b0d0084a008f"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-dal-node.rb b/Formula/tezos-dal-node.rb
index b18c0d261..c753d2a6d 100644
--- a/Formula/tezos-dal-node.rb
+++ b/Formula/tezos-dal-node.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/"
+    sha256 cellar: :any, ventura: "ae4d46f9ee59926660d527982c83551c2833d97c3b8f65159cca40b68546feaa"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb
index 0f698f2a7..23311150d 100644
--- a/Formula/tezos-node.rb
+++ b/Formula/tezos-node.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/"
+    sha256 cellar: :any, ventura: "0d45fa2b9ab741ec6383134cd4779a21de32fc3f785cab11b6fe6401a7c6b6c5"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb
index d47a7d8c2..7d4f64324 100644
--- a/Formula/tezos-signer.rb
+++ b/Formula/tezos-signer.rb
@@ -13,12 +13,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -26,6 +26,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/"
+    sha256 cellar: :any, ventura: "73755fc8d16a8b32f32a96d5f884deabdcd89ac5e5523f87c46d9ea98eed2b89"
   end
 
   def make_deps
@@ -37,11 +38,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node.rb
index 791778faf..61c974e25 100644
--- a/Formula/tezos-smart-rollup-node.rb
+++ b/Formula/tezos-smart-rollup-node.rb
@@ -15,12 +15,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite libffi tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq libffi tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -28,6 +28,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/"
+    sha256 cellar: :any, ventura: "3d73cb54743de0384b58e1f304090a95d38f459d3432c622803ee098d70b69f1"
   end
 
   def make_deps
@@ -39,11 +40,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)
diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb
index 571affb69..89724cd9c 100644
--- a/Formula/tezos-smart-rollup-wasm-debugger.rb
+++ b/Formula/tezos-smart-rollup-wasm-debugger.rb
@@ -14,12 +14,12 @@ class << self
 
   version "v21.0-1"
 
-  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
+  build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
     depends_on dependency => :build
   end
 
-  dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params]
+  dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params]
   dependencies.each do |dependency|
     depends_on dependency
   end
@@ -27,6 +27,7 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/"
+    sha256 cellar: :any, ventura: "fa140adac8c29af873d9b11f38a2d9ae12636f2ecbf6c8842c0b45a673062494"
   end
 
   def make_deps
@@ -38,11 +39,13 @@ def make_deps
     # Force linker to use libraries from the current brew installation.
     # Workaround for https://github.com/serokell/tezos-packaging/issues/700
     ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
+    # Workaround to avoid linking problem on mac
+    ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup"
     # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
     arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
-    system "rustup-init", "--default-toolchain", "1.71.1", "-y"
+    system "rustup", "install", "1.78.0"
     system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system ["source .cargo/env",  "make build-deps"].join(" && ")
+    system "make build-deps"
   end
 
   def install_template(dune_path, exec_path, name)