diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml
index c75ed054f..c9395a339 100644
--- a/.buildkite/pipeline-raw.yml
+++ b/.buildkite/pipeline-raw.yml
@@ -170,6 +170,7 @@ steps:
    - mkdir arm-binaries
    - buildkite-agent artifact download "docker/*" binaries --step "build-via-docker"
    # - buildkite-agent artifact download "docker/*" arm-binaries --step "build-arm-via-docker"
+   - mkdir arm-binaries/docker
    - ls binaries
    - nix develop .#autorelease -c ./scripts/autorelease.sh "$BUILDKITE_MESSAGE"
    branches: master
diff --git a/docker/docker-static-build.sh b/docker/docker-static-build.sh
index 1ee93f463..0b2b5c585 100755
--- a/docker/docker-static-build.sh
+++ b/docker/docker-static-build.sh
@@ -11,9 +11,10 @@ set -euo pipefail
 binaries=("octez-admin-client" "octez-client" "octez-node" "octez-signer" "octez-codec")
 
 for proto in $(jq -r ".active | .[]" ../protocols.json); do
-    binaries+=("octez-accuser-$proto" "octez-baker-$proto" "octez-tx-rollup-node-$proto" "octez-tx-rollup-client-$proto")
+    binaries+=("octez-accuser-$proto" "octez-baker-$proto")
 done
 
+binaries+=("octez-tx-rollup-node-PtLimaPt" "octez-tx-rollup-client-PtLimaPt")
 binaries+=("octez-smart-rollup-client-PtMumbai" "octez-smart-rollup-node-PtMumbai")
 
 if [[ "${USE_PODMAN-}" == "True" ]]; then
diff --git a/nix/build/release-binaries.nix b/nix/build/release-binaries.nix
index d9c8bde60..ac7e5eaf8 100644
--- a/nix/build/release-binaries.nix
+++ b/nix/build/release-binaries.nix
@@ -32,6 +32,26 @@ in [
     description = "A client to decode and encode JSON";
     supports = protocolsFormatted;
   }
+  {
+    name = "octez-tx-rollup-node-PtLimaPt";
+    description = "Transaction rollup node";
+    supports = "PtLimaPt";
+  }
+  {
+    name = "octez-tx-rollup-client-PtLimaPt";
+    description = "Client for interacting with transaction rollup node";
+    supports = "PtLimaPt";
+  }
+  {
+    name = "octez-smart-rollup-client-PtMumbai";
+    description = "Smart contract rollup CLI client for PtMumbai";
+    supports = "PtMumbai";
+  }
+  {
+    name = "octez-smart-rollup-node-PtMumbai";
+    description = "Tezos smart contract rollup node for PtMumbai";
+    supports = "PtMumbai";
+  }
 ] ++ builtins.concatMap (protocol: [
   {
     name = "octez-baker-${protocol}";
@@ -43,14 +63,4 @@ in [
     description = "Daemon for accusing";
     supports = protocol;
   }
-  {
-    name = "octez-tx-rollup-node-${protocol}";
-    description = "Transaction rollup node";
-    supports = protocol;
-  }
-  {
-    name = "octez-tx-rollup-client-${protocol}";
-    description = "Client for interacting with transaction rollup node";
-    supports = protocol;
-  }
 ]) protocols.active
diff --git a/protocols.json b/protocols.json
index deb23a9e6..328ad8d8b 100644
--- a/protocols.json
+++ b/protocols.json
@@ -25,6 +25,7 @@
     "PtKathma"
   ],
   "active": [
-    "PtLimaPt"
+    "PtLimaPt",
+    "PtMumbai"
   ]
 }