diff --git a/cluster/kube/lib/cockroachdb.libsonnet b/cluster/kube/lib/cockroachdb.libsonnet
index 2486570..dff2ebd 100644
--- a/cluster/kube/lib/cockroachdb.libsonnet
+++ b/cluster/kube/lib/cockroachdb.libsonnet
@@ -215,6 +215,13 @@
                         },
                     },
                     spec+: {
+                        strategy+: {
+                          type: "RollingUpdate",
+                          rollingUpdate: {
+                            maxSurge: 0,
+                            maxUnavailable: 1,
+                          },
+                        },
                         template+: {
                             metadata: server.deploy.metadata,
                             spec+: {
@@ -287,7 +294,7 @@
                                             "--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,
                                         ],