diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index d2a54fc6..9fea81c3 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -64,9 +64,9 @@ local rook = import "lib/rook.libsonnet";
             waw2: cockroachdb.Cluster("crdb-waw1") {
                 cfg+: {
                     topology: [
-                        { name: "bc01n01", node: "bc01n01.hswaw.net" },
                         { name: "bc01n02", node: "bc01n02.hswaw.net" },
                         { name: "dcr01s22", node: "dcr01s22.hswaw.net" },
+                        { name: "dcr01s24", node: "dcr01s24.hswaw.net" },
                     ],
                     // Host path on SSD.
                     hostPath: "/var/db/crdb-waw1",
@@ -74,6 +74,7 @@ local rook = import "lib/rook.libsonnet";
                         "crdb-waw1.hswaw.net",
                     ],
                 },
+                initJob:: null,
             },
             clients: {
                 cccampix: k0.cockroach.waw2.Client("cccampix"),
diff --git a/cluster/kube/lib/cockroachdb.libsonnet b/cluster/kube/lib/cockroachdb.libsonnet
index 24865709..dff2ebd9 100644
--- a/cluster/kube/lib/cockroachdb.libsonnet
+++ b/cluster/kube/lib/cockroachdb.libsonnet
@@ -215,6 +215,13 @@ local policies = import "../../../kube/policies.libsonnet";
                         },
                     },
                     spec+: {
+                        strategy+: {
+                          type: "RollingUpdate",
+                          rollingUpdate: {
+                            maxSurge: 0,
+                            maxUnavailable: 1,
+                          },
+                        },
                         template+: {
                             metadata: server.deploy.metadata,
                             spec+: {
@@ -287,7 +294,7 @@ local policies = import "../../../kube/policies.libsonnet";
                                             "--certs-dir", "/cockroach/cockroach-certs",
                                             "--advertise-host", "%s.cluster.local" % server.service.host, 
                                             "--cache", "25%", "--max-sql-memory", "25%",
-                                            "--join", std.join(",", ["%s.cluster.local:%d" % [s.service.host, cluster.cfg.portServe] for s in cluster.servers]),
+                                            "--join", std.join(",", ["%s.cluster.local:%d" % [s.service.host, cluster.cfg.portServe] for s in cluster.servers if s.service.host != server.service.host]),
                                             "--listen-addr=0.0.0.0:%d" % cluster.cfg.portServe,
                                             "--http-addr=0.0.0.0:%d" % cluster.cfg.portHttp,
                                         ],