diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f26a07007..e882d4419 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -13,7 +13,7 @@ steps:
     label: ":gandalf: Nightly Operator release"
     timeout_in_minutes: 10
     agents:
-      queue: k8s-builders
+      queue: v6-amd64-builders-m6id
     commands:
       - |
         TAG_NAME=$(ci/scripts/tag-check.sh) ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:publish-k8s-nightly-artifacts
diff --git a/operator/tests/e2e-with-flags/nodepools-delete/00-one-nodepool.yaml b/operator/tests/e2e-with-flags/nodepools-delete/00-one-nodepool.yaml
index 186842137..1f3a64840 100644
--- a/operator/tests/e2e-with-flags/nodepools-delete/00-one-nodepool.yaml
+++ b/operator/tests/e2e-with-flags/nodepools-delete/00-one-nodepool.yaml
@@ -8,6 +8,8 @@ spec:
   nodePools:
     - name: first
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "100m"
diff --git a/operator/tests/e2e-with-flags/nodepools-delete/01-add-second-pool.yaml b/operator/tests/e2e-with-flags/nodepools-delete/01-add-second-pool.yaml
index 7025fe262..1604dbd6f 100644
--- a/operator/tests/e2e-with-flags/nodepools-delete/01-add-second-pool.yaml
+++ b/operator/tests/e2e-with-flags/nodepools-delete/01-add-second-pool.yaml
@@ -8,6 +8,8 @@ spec:
   nodePools:
     - name: first
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "100m"
@@ -17,6 +19,8 @@ spec:
           memory: 256Mi
     - name: second
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "101m"
diff --git a/operator/tests/e2e-with-flags/nodepools-delete/02-delete-first-nodepool.yaml b/operator/tests/e2e-with-flags/nodepools-delete/02-delete-first-nodepool.yaml
index ae67e0cd8..bb052aef5 100644
--- a/operator/tests/e2e-with-flags/nodepools-delete/02-delete-first-nodepool.yaml
+++ b/operator/tests/e2e-with-flags/nodepools-delete/02-delete-first-nodepool.yaml
@@ -11,6 +11,8 @@ spec:
   nodePools:
     - name: second
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "101m"
diff --git a/operator/tests/e2e-with-flags/nodepools/00-one-nodepool.yaml b/operator/tests/e2e-with-flags/nodepools/00-one-nodepool.yaml
index 9ff18efd8..13de3658e 100644
--- a/operator/tests/e2e-with-flags/nodepools/00-one-nodepool.yaml
+++ b/operator/tests/e2e-with-flags/nodepools/00-one-nodepool.yaml
@@ -8,6 +8,8 @@ spec:
   nodePools:
     - name: nodepool1
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "100m"
diff --git a/operator/tests/e2e-with-flags/nodepools/01-two-nodepools.yaml b/operator/tests/e2e-with-flags/nodepools/01-two-nodepools.yaml
index e5c85001d..321c2bde8 100644
--- a/operator/tests/e2e-with-flags/nodepools/01-two-nodepools.yaml
+++ b/operator/tests/e2e-with-flags/nodepools/01-two-nodepools.yaml
@@ -8,6 +8,8 @@ spec:
   nodePools:
     - name: nodepool1
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "100m"
@@ -17,6 +19,8 @@ spec:
           memory: 256Mi
     - name: nodepool2
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "100m"
diff --git a/operator/tests/e2e-with-flags/nodepools/02-scale-down-first.yaml b/operator/tests/e2e-with-flags/nodepools/02-scale-down-first.yaml
index a45752000..9ee1ad345 100644
--- a/operator/tests/e2e-with-flags/nodepools/02-scale-down-first.yaml
+++ b/operator/tests/e2e-with-flags/nodepools/02-scale-down-first.yaml
@@ -8,6 +8,8 @@ spec:
   nodePools:
     - name: nodepool1
       replicas: 0
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "100m"
@@ -17,6 +19,8 @@ spec:
           memory: 256Mi
     - name: nodepool2
       replicas: 3
+      storage: {}
+      cloudCacheStorage: {}
       resources:
         requests:
           cpu: "100m"
diff --git a/taskfiles/k8s.yml b/taskfiles/k8s.yml
index 8bb85ea7e..c6203fe06 100644
--- a/taskfiles/k8s.yml
+++ b/taskfiles/k8s.yml
@@ -156,12 +156,23 @@ tasks:
         silent: true
       - 'echo "~~~ :docker: Build & Push operator container"'
       - docker buildx build
-        --platform linux/arm64,linux/amd64
+        --provenance false --sbom false --platform linux/amd64
         --file operator/Dockerfile
         --target manager
-        --tag docker.io/redpandadata/{{.OPERATOR_REPO}}:{{.TAG_NAME}}
+        --tag docker.io/redpandadata/{{.OPERATOR_REPO}}:{{.TAG_NAME}}-amd64
         --push
         ./dist
+      - docker buildx build
+        --provenance false --sbom false --platform linux/arm64
+        --file operator/Dockerfile
+        --target manager
+        --tag docker.io/redpandadata/{{.OPERATOR_REPO}}:{{.TAG_NAME}}-arm64
+        --push
+        ./dist
+      - docker manifest create docker.io/redpandadata/{{.OPERATOR_REPO}}:{{.TAG_NAME}}
+        --amend docker.io/redpandadata/{{.OPERATOR_REPO}}:{{.TAG_NAME}}-amd64
+        --amend docker.io/redpandadata/{{.OPERATOR_REPO}}:{{.TAG_NAME}}-arm64
+      - docker manifest push docker.io/redpandadata/{{.OPERATOR_REPO}}:{{.TAG_NAME}}
       - cmd: docker logout
     preconditions:
       - test -n "$DOCKERHUB_USER"