diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml
index 98a9b22f2..9597d1901 100644
--- a/.buildkite/pipeline-raw.yml
+++ b/.buildkite/pipeline-raw.yml
@@ -38,17 +38,6 @@ steps:
    - cd tests/bottle-hashes/
    - ./test-hash-insert.sh
 
- - label: build via nix
-   commands:
-   # NOTE: if this changes, remember to update the instructions in the nix/README.md too
-   - nix build . -o binaries
-   branches: "!master"
- - label: check flake
-   commands:
-   - nix flake check -L
-   branches: "!master"
-   # nix builds are usually cached, so we don't care about only_changes setting for it
-
  - label: build-via-docker
    # this step is used as a dependency, so we're defining 'key' explicitely
    key: build-via-docker
@@ -117,7 +106,7 @@ steps:
    - eval "$SET_VERSION"
    # Building all binary packages will take significant amount of time, so we build only one
    # in order to ensure package generation sanity
-   - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PsParisC
+   - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PsQuebec
    - rm -rf out
    # It takes much time to build binary package, so we do it only on master
    branches: "master"
@@ -145,7 +134,7 @@ steps:
    - eval "$SET_VERSION"
    # Building all binary packages will take significant amount of time, so we build only one
    # in order to ensure package generation sanity
-   - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PsParisC
+   - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PsQuebec
    - rm -rf out
    # It takes much time to build binary package, so we do it only on master
    branches: "master"
diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml
index c8a836f19..08daa1e26 100644
--- a/.github/workflows/build-bottles.yml
+++ b/.github/workflows/build-bottles.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         os: [ { id: macos-13, name: "ventura" } ]
         # we don't bottle meta-formulas that contain only services
-        formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PsQuebec, tezos-baker-PsQuebec, tezos-accuser-PsParisC, tezos-baker-PsParisC]
+        formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-experimental-agnostic-baker, tezos-node, tezos-accuser-PsRiotum, tezos-baker-PsRiotum, tezos-accuser-PsQuebec, tezos-baker-PsQuebec]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/Formula/tezos-accuser-PsQuebec.rb b/Formula/tezos-accuser-PsQuebec.rb
index 52eb99325..e1fd7d9aa 100644
--- a/Formula/tezos-accuser-PsQuebec.rb
+++ b/Formula/tezos-accuser-PsQuebec.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsquebec.version}/"
-    sha256 cellar: :any, ventura: "4fa6c8620561a27ea032d5178d9ab2be90f1df47cc3dccab5015d9e5161833fe"
   end
 
   def make_deps
diff --git a/Formula/tezos-accuser-PsParisC.rb b/Formula/tezos-accuser-PsRiotum.rb
similarity index 76%
rename from Formula/tezos-accuser-PsParisC.rb
rename to Formula/tezos-accuser-PsRiotum.rb
index 385f8e2d0..b3959fd78 100644
--- a/Formula/tezos-accuser-PsParisC.rb
+++ b/Formula/tezos-accuser-PsRiotum.rb
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2024 Oxhead Alpha
 # SPDX-License-Identifier: LicenseRef-MIT-OA
 
-class TezosAccuserPsparisc < Formula
+class TezosAccuserPsriotum < Formula
   @all_bins = []
 
   class << self
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -25,8 +25,7 @@ class << self
   desc "Daemon for accusing"
 
   bottle do
-    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsparisc.version}/"
-    sha256 cellar: :any, ventura: "57d5060867fd1d70439f2918aadfe8d64a5ad6d7c75ab5dcdac6a7c7b6dd9072"
+    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsriotum.version}/"
   end
 
   def make_deps
@@ -62,7 +61,7 @@ def install
 
       set -euo pipefail
 
-      accuser="#{bin}/octez-accuser-PsParisC"
+      accuser="#{bin}/octez-accuser-PsRiotum"
 
       accuser_config="$TEZOS_CLIENT_DIR/config"
       mkdir -p "$TEZOS_CLIENT_DIR"
@@ -77,21 +76,21 @@ def install
 
       exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run
     EOS
-    File.write("tezos-accuser-PsParisC-start", startup_contents)
-    bin.install "tezos-accuser-PsParisC-start"
+    File.write("tezos-accuser-PsRiotum-start", startup_contents)
+    bin.install "tezos-accuser-PsRiotum-start"
     make_deps
-    install_template "src/proto_020_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe",
-                     "_build/default/src/proto_020_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe",
-                     "octez-accuser-PsParisC"
+    install_template "src/proto_022_PsRiotum/bin_accuser/main_accuser_022_PsRiotum.exe",
+                     "_build/default/src/proto_022_PsRiotum/bin_accuser/main_accuser_022_PsRiotum.exe",
+                     "octez-accuser-PsRiotum"
   end
 
   service do
-    run opt_bin/"tezos-accuser-PsParisC-start"
+    run opt_bin/"tezos-accuser-PsRiotum-start"
     require_root true
     environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732"
     keep_alive true
-    log_path var/"log/tezos-accuser-PsParisC.log"
-    error_log_path var/"log/tezos-accuser-PsParisC.log"
+    log_path var/"log/tezos-accuser-PsRiotum.log"
+    error_log_path var/"log/tezos-accuser-PsRiotum.log"
   end
 
   def post_install
diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb
index 418006eff..44eb4fa2c 100644
--- a/Formula/tezos-admin-client.rb
+++ b/Formula/tezos-admin-client.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
-    sha256 cellar: :any, ventura: "aed6d105aaeecabbc13be048ac2fd89f0b464439207ef534b08c5b41fbbeb7e4"
   end
 
   def make_deps
diff --git a/Formula/tezos-baker-PsQuebec.rb b/Formula/tezos-baker-PsQuebec.rb
index 7f5416f24..515cf6909 100644
--- a/Formula/tezos-baker-PsQuebec.rb
+++ b/Formula/tezos-baker-PsQuebec.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsquebec.version}/"
-    sha256 cellar: :any, ventura: "db14683f1a4c940c5b45f18c157cfeb4aa3729eccb0d889dffb198f3b51e1bdf"
   end
 
   def make_deps
diff --git a/Formula/tezos-baker-PsParisC.rb b/Formula/tezos-baker-PsRiotum.rb
similarity index 78%
rename from Formula/tezos-baker-PsParisC.rb
rename to Formula/tezos-baker-PsRiotum.rb
index 4c6c48b46..3dc609a8b 100644
--- a/Formula/tezos-baker-PsParisC.rb
+++ b/Formula/tezos-baker-PsRiotum.rb
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2024 Oxhead Alpha
 # SPDX-License-Identifier: LicenseRef-MIT-OA
 
-class TezosBakerPsparisc < Formula
+class TezosBakerPsriotum < Formula
   @all_bins = []
 
   class << self
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -25,8 +25,7 @@ class << self
   desc "Daemon for baking"
 
   bottle do
-    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsparisc.version}/"
-    sha256 cellar: :any, ventura: "6b5aa18694d2030ce0cd6c9a68ccc7cc8ef927ace0fdbc2dc3b34241a67a1ea2"
+    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPsriotum.version}/"
   end
 
   def make_deps
@@ -62,7 +61,7 @@ def install
 
       set -euo pipefail
 
-      baker="#{bin}/octez-baker-PsParisC"
+      baker="#{bin}/octez-baker-PsRiotum"
 
       baker_config="$TEZOS_CLIENT_DIR/config"
       mkdir -p "$TEZOS_CLIENT_DIR"
@@ -87,21 +86,21 @@ def install
           launch_baker "$BAKER_ACCOUNT"
       fi
     EOS
-    File.write("tezos-baker-PsParisC-start", startup_contents)
-    bin.install "tezos-baker-PsParisC-start"
+    File.write("tezos-baker-PsRiotum-start", startup_contents)
+    bin.install "tezos-baker-PsRiotum-start"
     make_deps
-    install_template "src/proto_020_PsParisC/bin_baker/main_baker_020_PsParisC.exe",
-                     "_build/default/src/proto_020_PsParisC/bin_baker/main_baker_020_PsParisC.exe",
-                     "octez-baker-PsParisC"
+    install_template "src/proto_022_PsRiotum/bin_baker/main_baker_022_PsRiotum.exe",
+                     "_build/default/src/proto_022_PsRiotum/bin_baker/main_baker_022_PsRiotum.exe",
+                     "octez-baker-PsRiotum"
   end
 
   service do
-    run opt_bin/"tezos-baker-PsParisC-start"
+    run opt_bin/"tezos-baker-PsRiotum-start"
     require_root true
     environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", TEZOS_NODE_DIR: "", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732", BAKER_ACCOUNT: ""
     keep_alive true
-    log_path var/"log/tezos-baker-PsParisC.log"
-    error_log_path var/"log/tezos-baker-PsParisC.log"
+    log_path var/"log/tezos-baker-PsRiotum.log"
+    error_log_path var/"log/tezos-baker-PsRiotum.log"
   end
 
   def post_install
diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb
index 28aa6a6ca..85809fb5d 100644
--- a/Formula/tezos-client.rb
+++ b/Formula/tezos-client.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
-    sha256 cellar: :any, ventura: "66f488d389c28677bda4f2a69c27e4e95095df7b09fb97dc6c99a428b021a9be"
   end
 
   def make_deps
diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb
index 5e00fe584..d5c0038f3 100644
--- a/Formula/tezos-codec.rb
+++ b/Formula/tezos-codec.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
-    sha256 cellar: :any, ventura: "c2e025c499d79bd5de75411eea65aefc026a135fbad2defa728d37494b990244"
   end
 
   def make_deps
diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb
deleted file mode 100644
index f5b08b5f4..000000000
--- a/Formula/tezos-dac-client.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Oxhead Alpha
-# SPDX-License-Identifier: LicenseRef-MIT-OA
-
-class TezosDacClient < Formula
-  @all_bins = []
-
-  class << self
-    attr_accessor :all_bins
-  end
-  homepage "https://gitlab.com/tezos/tezos"
-
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
-
-  version "v21.4-1"
-
-  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 libpq tezos-sapling-params]
-  dependencies.each do |dependency|
-    depends_on dependency
-  end
-  desc "A Data Availability Committee Tezos client"
-
-  bottle do
-    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/"
-    sha256 cellar: :any, ventura: "f438f15100bb74b93168a7f7441f0d1f27e1f79fe452761be0c0f8a74d119279"
-  end
-
-  def make_deps
-    ENV.deparallelize
-    ENV["CARGO_HOME"]="./.cargo"
-    # Disable usage of instructions from the ADX extension to avoid incompatibility
-    # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/
-    ENV["BLST_PORTABLE"]="yes"
-    # 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", "install", "1.78.0"
-    system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system "make build-deps"
-  end
-
-  def install_template(dune_path, exec_path, name)
-    bin.mkpath
-    self.class.all_bins << name
-    system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ")
-    bin.install name
-    ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}"
-  end
-
-  def install
-    make_deps
-    install_template "src/bin_dac_client/main_dac_client.exe",
-                     "_build/default/src/bin_dac_client/main_dac_client.exe",
-                     "octez-dac-client"
-  end
-end
diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb
deleted file mode 100644
index 065bcab01..000000000
--- a/Formula/tezos-dac-node.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Oxhead Alpha
-# SPDX-License-Identifier: LicenseRef-MIT-OA
-
-class TezosDacNode < Formula
-  @all_bins = []
-
-  class << self
-    attr_accessor :all_bins
-  end
-  homepage "https://gitlab.com/tezos/tezos"
-
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
-
-  version "v21.4-1"
-
-  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 libpq tezos-sapling-params]
-  dependencies.each do |dependency|
-    depends_on dependency
-  end
-  desc "A Data Availability Committee Tezos node"
-
-  bottle do
-    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/"
-    sha256 cellar: :any, ventura: "b082c8216442c1261f0ac1857f2770cc01dec6da5faea4dbb8a7fb3b203ba28c"
-  end
-
-  def make_deps
-    ENV.deparallelize
-    ENV["CARGO_HOME"]="./.cargo"
-    # Disable usage of instructions from the ADX extension to avoid incompatibility
-    # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/
-    ENV["BLST_PORTABLE"]="yes"
-    # 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", "install", "1.78.0"
-    system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
-    system "make build-deps"
-  end
-
-  def install_template(dune_path, exec_path, name)
-    bin.mkpath
-    self.class.all_bins << name
-    system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ")
-    bin.install name
-    ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}"
-  end
-
-  def install
-    make_deps
-    install_template "src/bin_dac_node/main_dac.exe",
-                     "_build/default/src/bin_dac_node/main_dac.exe",
-                     "octez-dac-node"
-  end
-end
diff --git a/Formula/tezos-dal-node.rb b/Formula/tezos-dal-node.rb
index 108ee7ad6..182125480 100644
--- a/Formula/tezos-dal-node.rb
+++ b/Formula/tezos-dal-node.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/"
-    sha256 cellar: :any, ventura: "b909d03830237f1fb86c2e89664e2901279782b964fd28d3fe6978834d4e5bf5"
   end
 
   def make_deps
diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb
index 3efc2a59a..b63d9d2fe 100644
--- a/Formula/tezos-node-ghostnet.rb
+++ b/Formula/tezos-node-ghostnet.rb
@@ -3,7 +3,7 @@
 
 class TezosNodeGhostnet < Formula
   url "file:///dev/null"
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   depends_on "tezos-node"
 
diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb
index b4d94aba0..318735f20 100644
--- a/Formula/tezos-node-mainnet.rb
+++ b/Formula/tezos-node-mainnet.rb
@@ -3,7 +3,7 @@
 
 class TezosNodeMainnet < Formula
   url "file:///dev/null"
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   depends_on "tezos-node"
 
diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb
index 8d215974b..00584cf8b 100644
--- a/Formula/tezos-node.rb
+++ b/Formula/tezos-node.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/"
-    sha256 cellar: :any, ventura: "e0aa5cfe77b21f7c488c4e07bf0f126f963a2aa6a98bdb0db6786e7afbd852da"
   end
 
   def make_deps
diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb
index f65218d82..098fc9082 100644
--- a/Formula/tezos-signer-http.rb
+++ b/Formula/tezos-signer-http.rb
@@ -3,7 +3,7 @@
 
 class TezosSignerHttp < Formula
   url "file:///dev/null"
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   depends_on "tezos-signer"
 
diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb
index d79ba46fa..a0e1713c7 100644
--- a/Formula/tezos-signer-https.rb
+++ b/Formula/tezos-signer-https.rb
@@ -3,7 +3,7 @@
 
 class TezosSignerHttps < Formula
   url "file:///dev/null"
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   depends_on "tezos-signer"
 
diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb
index c83422af5..bdd09edd3 100644
--- a/Formula/tezos-signer-tcp.rb
+++ b/Formula/tezos-signer-tcp.rb
@@ -3,7 +3,7 @@
 
 class TezosSignerTcp < Formula
   url "file:///dev/null"
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   depends_on "tezos-signer"
 
diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb
index 9452d9650..6e1799f3b 100644
--- a/Formula/tezos-signer-unix.rb
+++ b/Formula/tezos-signer-unix.rb
@@ -3,7 +3,7 @@
 
 class TezosSignerUnix < Formula
   url "file:///dev/null"
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   depends_on "tezos-signer"
 
diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb
index 8d1bc57eb..1c449bf8d 100644
--- a/Formula/tezos-signer.rb
+++ b/Formula/tezos-signer.rb
@@ -9,9 +9,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -26,7 +26,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/"
-    sha256 cellar: :any, ventura: "0002fbe879b5a4377b6c545afc573b305ab240f93666a174987beb8cef2e91f7"
   end
 
   def make_deps
diff --git a/Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node.rb
index aedc29f90..2ced69a6f 100644
--- a/Formula/tezos-smart-rollup-node.rb
+++ b/Formula/tezos-smart-rollup-node.rb
@@ -11,9 +11,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -28,7 +28,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/"
-    sha256 cellar: :any, ventura: "44b35f39c82fcbd52feac8222a2b5b868eaf3fb06658c4c4551c43a199ca1574"
   end
 
   def make_deps
diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb
index 727940c9e..53c357dd9 100644
--- a/Formula/tezos-smart-rollup-wasm-debugger.rb
+++ b/Formula/tezos-smart-rollup-wasm-debugger.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v21.4", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v22.0-rc1", :shallow => false
 
-  version "v21.4-1"
+  version "v22.0-rc1-1"
 
   build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam]
   build_dependencies.each do |dependency|
@@ -27,7 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/"
-    sha256 cellar: :any, ventura: "bb70b1bf9583b53efc43e974bed769cac419a3843dd3ed60ff14c0ca32904cf1"
   end
 
   def make_deps
diff --git a/baking/pyproject.toml b/baking/pyproject.toml
index 5dc8cd0e4..0ac97672b 100644
--- a/baking/pyproject.toml
+++ b/baking/pyproject.toml
@@ -14,7 +14,7 @@ description = "Package that provides systemd services that orchestrate other ser
 license = { text = "LicenseRef-MIT-OA" }
 requires-python = ">=3.8"
 readme = "README.md"
-version = "v21.4"
+version = "v22.0-rc1"
 
 [tool.setuptools.packages.find]
 where= ["src"]
diff --git a/baking/src/tezos_baking/steps.py b/baking/src/tezos_baking/steps.py
index 9478eb785..24e68f328 100644
--- a/baking/src/tezos_baking/steps.py
+++ b/baking/src/tezos_baking/steps.py
@@ -107,6 +107,7 @@ def pprint_options(self):
     "mainnet": "Main Tezos network",
     "ghostnet": "Long running test network, currently using the Paris Tezos protocol",
     "quebecnet": "Test network using the PsQuebec Tezos protocol",
+    "rionet": "Test network using the PsRiotum Tezos protocol",
 }
 
 # Steps
diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py
index 24fe115c2..eb599b971 100644
--- a/baking/src/tezos_baking/tezos_setup_wizard.py
+++ b/baking/src/tezos_baking/tezos_setup_wizard.py
@@ -197,7 +197,7 @@ def network_name_or_teztnets_url(network):
     id="network",
     prompt="Which Tezos network would you like to use?\nCurrently supported:",
     help="The selected network will be used to set up all required services.\n"
-    "The currently supported protocol is PsQuebec (used on `mainnet`, `ghostnet` and `quebecnet`).\n"
+    "The currently supported protocol is PsQuebec (used on `mainnet`, `ghostnet` and `quebecnet`) and `PsRiotum` (used on `rionet`).\n"
     "Keep in mind that you must select the test network (e.g. ghostnet)\n"
     "if you plan on baking with a faucet JSON file.\n",
     options=networks,
diff --git a/docker/active-protocols b/docker/active-protocols
index d60f30420..e35a63053 100644
--- a/docker/active-protocols
+++ b/docker/active-protocols
@@ -1,3 +1,3 @@
-PsParisC
 PsQuebec
+PsRiotum
 alpha
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index b35cdce43..9a96d7d75 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -9,7 +9,7 @@ RUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \
   autoconf automake libtool linux-headers \
   libffi-dev zlib-dev zlib-static coreutils perl-utils cmake \
   protobuf protobuf-dev sqlite-dev sqlite-libs cargo upx libc-dev \
-  sqlite-static
+  sqlite-static openssl-libs-static
 COPY ./build/build-rust.sh /build-rust.sh
 RUN /build-rust.sh
 ARG OCTEZ_VERSION
diff --git a/docker/create_opam_repo.sh b/docker/create_opam_repo.sh
index 6f9db68c9..2db4045b1 100755
--- a/docker/create_opam_repo.sh
+++ b/docker/create_opam_repo.sh
@@ -24,6 +24,8 @@ cd ..
 # copying virtual opam file which depends on everything octez need
 mkdir -p opam-repository/packages/octez-deps/octez-deps.dev
 cp tezos/opam/virtual/octez-deps.opam.locked opam-repository/packages/octez-deps/octez-deps.dev/opam
+mkdir -p opam-repository/packages/stdcompat/stdcompat.19
+cp tezos/opam/virtual/stdcompat.opam.locked opam-repository/packages/stdcompat/stdcompat.19/opam
 
 # This package adds some constraints to the solution found by the opam solver.
 dummy_pkg=octez-dummy
@@ -57,7 +59,7 @@ mv opam-repository arm64
 filter() {
  pushd "$1"
  OPAMSOLVERTIMEOUT=600 opam admin filter --yes --resolve \
-   "octez-deps,ocaml,ocaml-base-compiler,odoc<2.3.0,ledgerwallet-tezos,caqti-driver-postgresql,$dummy_pkg" \
+   "octez-deps,ocaml,ocaml-base-compiler,odoc,ledgerwallet-tezos,caqti-driver-postgresql,$dummy_pkg" \
    --environment "os=linux,arch=$1,os-family=debian"
  rm -rf packages/"$dummy_pkg" packages/octez-deps
  popd
diff --git a/docker/octez-executables b/docker/octez-executables
index 3eec20aa3..b8e8fe93f 100644
--- a/docker/octez-executables
+++ b/docker/octez-executables
@@ -1,14 +1,13 @@
 octez-smart-rollup-wasm-debugger
 octez-smart-rollup-node
-octez-dac-client
-octez-dac-node
 octez-dal-node
 octez-signer
 octez-codec
 octez-client
 octez-admin-client
+octez-experimental-agnostic-baker
 octez-node
+octez-accuser-PsRiotum
+octez-baker-PsRiotum
 octez-accuser-PsQuebec
 octez-baker-PsQuebec
-octez-accuser-PsParisC
-octez-baker-PsParisC
diff --git a/docker/package/Dockerfile-fedora b/docker/package/Dockerfile-fedora
index 972b15e43..caea1962c 100644
--- a/docker/package/Dockerfile-fedora
+++ b/docker/package/Dockerfile-fedora
@@ -10,7 +10,7 @@ RUN dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel \
                    rpmdevtools python3-devel python3-setuptools \
                    wget opam rsync which cargo autoconf mock systemd \
                    systemd-rpm-macros cmake python3-wheel python3-tox-current-env \
-                   protobuf-compiler protobuf-devel sqlite-devel
+                   protobuf-compiler protobuf-devel sqlite-devel openssl-devel
 
 ENV USER dockerbuilder
 RUN useradd dockerbuilder
diff --git a/docker/package/Dockerfile-ubuntu b/docker/package/Dockerfile-ubuntu
index 57dd9db3e..e6fd52298 100644
--- a/docker/package/Dockerfile-ubuntu
+++ b/docker/package/Dockerfile-ubuntu
@@ -23,13 +23,13 @@ FROM ubuntu:${dist}
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
-RUN apt-get update -y
+RUN apt-get update  -y
 RUN apt-get install -y libev-dev libgmp-dev libhidapi-dev libffi-dev \
                    zlib1g-dev libpq-dev m4 perl pkg-config \
                    debhelper dh-make dh-python devscripts autotools-dev \
                    python3-all python3-setuptools wget rsync cmake \
                    software-properties-common libprotobuf-dev libsqlite3-dev \
-                   protobuf-compiler
+                   protobuf-compiler libssl-dev
 
 ARG dist
 RUN if [ "$dist" = "focal" ]; then apt-get install -y dh-systemd; fi
diff --git a/docker/package/package_generator.py b/docker/package/package_generator.py
index a2cf9b2d8..6a43a307d 100755
--- a/docker/package/package_generator.py
+++ b/docker/package/package_generator.py
@@ -63,6 +63,7 @@ def get_ubuntu_run_deps(binaries_dir):
         return []
 
     return [
+        "libssl-dev",
         "libev-dev",
         "libgmp-dev",
         "libhidapi-dev",
@@ -83,6 +84,7 @@ def get_fedora_run_deps(binaries_dir):
         return []
 
     return [
+        "openssl-devel",
         "libev-devel",
         "gmp-devel",
         "hidapi-devel",
diff --git a/docker/package/packages.py b/docker/package/packages.py
index 7b9331410..bd1907472 100644
--- a/docker/package/packages.py
+++ b/docker/package/packages.py
@@ -20,11 +20,13 @@
     "mainnet": "mainnet",
     "ghostnet": "ghostnet",
     "quebecnet": "https://teztnets.com/quebecnet",
+    "rionet": "https://teztnets.com/rionet",
 }
 networks_protos = {
     "mainnet": ["PsQuebec"],
     "ghostnet": ["PsQuebec"],
     "quebecnet": ["PsQuebec"],
+    "rionet": ["PsRiotum"],
 }
 
 protocol_numbers = {
@@ -33,6 +35,7 @@
     "PtParisB": "019",
     "PsParisC": "020",
     "PsQuebec": "021",
+    "PsRiotum": "022",
 }
 
 signer_units = [
@@ -177,22 +180,6 @@
             dune_filepath="src/bin_codec/codec.exe",
         )
     },
-    {
-        "tezos-dac-client": TezosBinaryPackage(
-            "tezos-dac-client",
-            "A Data Availability Committee Tezos client",
-            meta=packages_meta,
-            dune_filepath="src/bin_dac_client/main_dac_client.exe",
-        )
-    },
-    {
-        "tezos-dac-node": TezosBinaryPackage(
-            "tezos-dac-node",
-            "A Data Availability Committee Tezos node",
-            meta=packages_meta,
-            dune_filepath="src/bin_dac_node/main_dac.exe",
-        )
-    },
     {
         "tezos-dal-node": TezosBinaryPackage(
             "tezos-dal-node",
diff --git a/docker/tests/binaries.json b/docker/tests/binaries.json
index 8cdf5abd6..c3247b6fe 100644
--- a/docker/tests/binaries.json
+++ b/docker/tests/binaries.json
@@ -2,18 +2,17 @@
     "released": [
         "tezos-smart-rollup-wasm-debugger",
         "tezos-smart-rollup-node",
-        "tezos-dac-client",
-        "tezos-dac-node",
         "tezos-dal-node",
         "tezos-signer",
         "tezos-codec",
         "tezos-client",
         "tezos-admin-client",
+        "tezos-experimental-agnostic-baker",
         "tezos-node",
+        "tezos-accuser-PsRiotum",
+        "tezos-baker-PsRiotum",
         "tezos-accuser-PsQuebec",
         "tezos-baker-PsQuebec",
-        "tezos-accuser-PsParisC",
-        "tezos-baker-PsParisC",
         "tezos-sapling-params",
         "tezos-baking"
     ],
diff --git a/docs/baking.md b/docs/baking.md
index eec732dcf..e4e7bbc4c 100644
--- a/docs/baking.md
+++ b/docs/baking.md
@@ -30,7 +30,8 @@ that you can use by following the [installation instructions](https://www.raspbe
 In order to run a baking instance, you'll need the following Tezos binaries:
 `tezos-client`, `tezos-node`, `tezos-baker-<proto>`.
 
-The currently supported protocol is `PsQuebec` (used on `quebecnet`, `ghostnet`, and `mainnet`).
+The currently supported protocol is `PsQuebec` (used on `quebecnet`, `ghostnet`, and `mainnet`)
+and `PsRiotum` (used on `rionet`).
 Also, note that the corresponding packages have protocol
 suffix in lowercase, e.g. the list of available baker packages can be found
 [here](https://launchpad.net/~serokell/+archive/ubuntu/tezos/+packages?field.name_filter=tezos-baker&field.status_filter=published).
diff --git a/flake.lock b/flake.lock
index 27368efda..71f958185 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1243,11 +1243,11 @@
     "opam-repository_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1723381368,
-        "narHash": "sha256-fN8jaeSfK8lbIQcvPXk96FeH8i7sjGjkwqnf0C9ZCog=",
+        "lastModified": 1738066957,
+        "narHash": "sha256-zUOPhbEsAJprwvanDVDT3DSV1ioUjuGxMVYCYlzfd2E=",
         "owner": "ocaml",
         "repo": "opam-repository",
-        "rev": "0f4d0ee5b69b496a4e26f305891c31400f0b4b5f",
+        "rev": "aa131f3eda80ed7121debe7582faaf50448bc105",
         "type": "github"
       },
       "original": {
@@ -1416,11 +1416,11 @@
     "tezos": {
       "flake": false,
       "locked": {
-        "lastModified": 1740508137,
-        "narHash": "sha256-d/ToAxMUDUQ9e5XFkpFm61VEM5yqEaKNpmixkWZPq4k=",
+        "lastModified": 1740505579,
+        "narHash": "sha256-Gf83zujQlUWJVu8UFweDB+NBefCQ6dlOKX5FAs68eQk=",
         "owner": "tezos",
         "repo": "tezos",
-        "rev": "b8278e10123c26844434ac1d2ff83bbc666fafd5",
+        "rev": "f1704a0580f70c48451cf0beef0a93bf10f536a9",
         "type": "gitlab"
       },
       "original": {
diff --git a/meta.json b/meta.json
index 39919479e..79652e010 100644
--- a/meta.json
+++ b/meta.json
@@ -1,5 +1,5 @@
 {
   "release": "1",
   "maintainer": "Serokell <hi@serokell.io>",
-  "tezos_ref": "octez-v21.4"
+  "tezos_ref": "octez-v22.0-rc1"
 }
diff --git a/nix/README.md b/nix/README.md
index 381c3391d..22f693144 100644
--- a/nix/README.md
+++ b/nix/README.md
@@ -5,6 +5,8 @@
 
 # Building and packaging tezos using nix
 
+**⚠️ Deprecation Warning:** *Nix build is deprecated.*
+
 ## Dynamically built binaries
 
 In order to build all binaries run at the root of this project:
diff --git a/nix/build/release-binaries.nix b/nix/build/release-binaries.nix
index 5ae73bc5d..25e979ed3 100644
--- a/nix/build/release-binaries.nix
+++ b/nix/build/release-binaries.nix
@@ -14,11 +14,6 @@ in [
     '';
     supports = protocolsFormatted;
   }
-  {
-    name = "octez-dac-client";
-    description = "A Data Availability Committee Tezos client";
-    supports = protocolsFormatted;
-  }
   {
     name = "octez-admin-client";
     description = ''
@@ -35,14 +30,6 @@ in [
     '';
     supports = protocolsFormatted;
   }
-  {
-    name = "octez-dac-node";
-    description =''
-      A Data Availability Committee Tezos node.
-      For more info on DAC please check https://research-development.nomadic-labs.com/introducing-data-availability-committees.html
-    '';
-    supports = protocolsFormatted;
-  }
   {
     name = "octez-dal-node";
     description =''
diff --git a/nix/modules/common.nix b/nix/modules/common.nix
index 9877d2ba4..17b1c5698 100644
--- a/nix/modules/common.nix
+++ b/nix/modules/common.nix
@@ -21,11 +21,11 @@ rec {
   daemonOptions = sharedOptions // {
 
     baseProtocols = mkOption {
-      type = types.listOf (types.enum ["PsParisC" "PsquebeC"]);
+      type = types.listOf (types.enum ["PsQuebec"]);
       description = ''
         List of protocols for which daemons will be run.
       '';
-      example = ["PsParisC"];
+      example = ["PsQuebec"];
     };
 
     rpcPort = mkOption {
diff --git a/nix/modules/tezos-accuser.nix b/nix/modules/tezos-accuser.nix
index f153bc749..e4c15510b 100644
--- a/nix/modules/tezos-accuser.nix
+++ b/nix/modules/tezos-accuser.nix
@@ -7,10 +7,8 @@ with lib;
 
 let
   octez-accuser-pkgs = {
-    "PsParisC" =
-      "${pkgs.octezPackages.octez-accuser-PsParisC}/bin/octez-accuser-PsParisC";
-    "PsquebeC" =
-      "${pkgs.octezPackages.octez-accuser-PsquebeC}/bin/octez-baker-PsquebeC";
+    "PsQuebec" =
+      "${pkgs.octezPackages.octez-accuser-PsQuebec}/bin/octez-baker-PsQuebec";
   };
   cfg = config.services.octez-accuser;
   common = import ./common.nix { inherit lib; inherit pkgs; };
diff --git a/nix/modules/tezos-baker.nix b/nix/modules/tezos-baker.nix
index 87b8ae4f2..a4698c9e2 100644
--- a/nix/modules/tezos-baker.nix
+++ b/nix/modules/tezos-baker.nix
@@ -7,10 +7,8 @@ with lib;
 
 let
   octez-baker-pkgs = {
-    "PsParisC" =
-      "${pkgs.octezPackages.octez-baker-PsParisC}/bin/octez-baker-PsParisC";
-    "PsquebeC" =
-      "${pkgs.octezPackages.octez-baker-PsquebeC}/bin/octez-baker-PsParisC";
+    "PsQuebec" =
+      "${pkgs.octezPackages.octez-baker-PsQuebec}/bin/octez-baker-PsQuebec";
   };
   octez-client = "${pkgs.octezPackages.octez-client}/bin/octez-client";
   cfg = config.services.octez-baker;
diff --git a/protocols.json b/protocols.json
index 2e35f5bba..f20a4d91f 100644
--- a/protocols.json
+++ b/protocols.json
@@ -27,10 +27,11 @@
     "PtMumbai",
     "PtNairob",
     "Proxford",
-    "PtParisB"
+    "PtParisB",
+    "PsParisC"
   ],
   "active": [
-    "PsParisC",
-    "PsQuebec"
+    "PsQuebec",
+    "PsRiotum"
   ]
 }
diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh
index 3e67f7fe1..a54bc4f31 100755
--- a/scripts/build-all-bottles.sh
+++ b/scripts/build-all-bottles.sh
@@ -19,7 +19,7 @@ set -euo pipefail
 retval="0"
 
 # we don't bottle meta-formulas that contain only services
-formulae=("tezos-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-node" "tezos-accuser-PsQuebec" "tezos-baker-PsQuebec" "tezos-accuser-PsParisC" "tezos-baker-PsParisC")
+formulae=("tezos-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-experimental-agnostic-baker" "tezos-node" "tezos-accuser-PsRiotum" "tezos-baker-PsRiotum" "tezos-accuser-PsQuebec" "tezos-baker-PsQuebec")
 
 # tezos-sapling-params is used as a dependency for some of the formulas
 # so we handle it separately.
diff --git a/tests/tezos-binaries.nix b/tests/tezos-binaries.nix
index 2f395ed32..673af86de 100644
--- a/tests/tezos-binaries.nix
+++ b/tests/tezos-binaries.nix
@@ -15,9 +15,9 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: {
 
   testScript = ''
     path_to_binaries = "${path-to-binaries}"
-    octez_accuser = f"{path_to_binaries}/octez-accuser-PsParisC"
+    octez_accuser = f"{path_to_binaries}/octez-accuser-PsQuebec"
     octez_admin_client = f"{path_to_binaries}/octez-admin-client"
-    octez_baker = f"{path_to_binaries}/octez-baker-PsParisC"
+    octez_baker = f"{path_to_binaries}/octez-baker-PsQuebec"
     octez_client = f"{path_to_binaries}/octez-client"
     octez_node = f"{path_to_binaries}/octez-node"
     octez_signer = f"{path_to_binaries}/octez-signer"
diff --git a/tests/tezos-modules.nix b/tests/tezos-modules.nix
index 440bcbb59..58f8a0c39 100644
--- a/tests/tezos-modules.nix
+++ b/tests/tezos-modules.nix
@@ -19,12 +19,12 @@ let
 
   octez-accuser = {
     enable = true;
-    baseProtocols = ["PsParisC"];
+    baseProtocols = ["PsQuebec"];
   };
 
   octez-baker = {
     enable = true;
-    baseProtocols = ["PsParisC"];
+    baseProtocols = ["PsQuebec"];
     bakerAccountAlias = "baker";
     bakerSecretKey = "unencrypted:edsk3KaTNj1d8Xd3kMBrZkJrfkqsz4XwwiBXatuuVgTdPye2KpE98o";
   };
diff --git a/tests/tezos-nix-binaries.nix b/tests/tezos-nix-binaries.nix
index d45f8d9a4..aa15b7738 100644
--- a/tests/tezos-nix-binaries.nix
+++ b/tests/tezos-nix-binaries.nix
@@ -5,7 +5,7 @@ let
   inherit (pkgs) system;
   inherit (pkgs.octezPackages)
     octez-client octez-admin-client octez-node octez-signer octez-codec
-    octez-accuser-PsParisC octez-baker-PsParisC;
+    octez-accuser-PsQuebec octez-baker-PsQuebec;
 in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: {
   name = "tezos-nix-binaries-test";
   nodes.machine = { ... }: {
@@ -19,9 +19,9 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: {
   };
 
   testScript = ''
-    octez_accuser = "${octez-accuser-PsParisC}/bin/octez-accuser-PsParisC"
+    octez_accuser = "${octez-accuser-PsQuebec}/bin/octez-accuser-PsQuebec"
     octez_admin_client = "${octez-admin-client}/bin/octez-admin-client"
-    octez_baker = "${octez-baker-PsParisC}/bin/octez-baker-PsParisC"
+    octez_baker = "${octez-baker-PsQuebec}/bin/octez-baker-PsQuebec"
     octez_client = (
         "${octez-client}/bin/octez-client"
     )