diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml
index 3393eb60..4dbc155c 100644
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@@ -31,6 +31,8 @@ conf:
             backend:
               - mode tcp
               - option tcpka
+              - option tcp-check
+              - option redispatch
       kube-system:
         kubernetes-etcd:
           server_opts: "check"
@@ -42,6 +44,8 @@ conf:
             backend:
               - mode tcp
               - option tcpka
+              - option tcp-check
+              - option redispatch
 
   haproxy:
     container_config_dir: /usr/local/etc/haproxy
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index 1d79ce31..8ce073a2 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -580,7 +580,7 @@ data:
         services:
           default:
             kubernetes:
-              server_opts: "check"
+              server_opts: "check port 6443"
               conf_parts:
                 frontend:
                   - mode tcp
@@ -589,9 +589,11 @@ data:
                 backend:
                   - mode tcp
                   - option tcpka
+                  - option tcp-check
+                  - option redispatch
           kube-system:
             kubernetes-etcd:
-              server_opts: "check"
+              server_opts: "check port 2379"
               conf_parts:
                 frontend:
                   - mode tcp
@@ -600,6 +602,8 @@ data:
                 backend:
                   - mode tcp
                   - option tcpka
+                  - option tcp-check
+                  - option redispatch
 
     images:
       tags:
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index aa0cc4b2..f83d9d47 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -629,6 +629,8 @@ data:
                 backend:
                   - mode tcp
                   - option tcpka
+                  - option tcp-check
+                  - option redispatch
           kube-system:
             kubernetes-etcd:
               server_opts: "check"
@@ -640,6 +642,8 @@ data:
                 backend:
                   - mode tcp
                   - option tcpka
+                  - option tcp-check
+                  - option redispatch
 
     images:
       tags:
diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml
index 44265701..23d5f0f6 100644
--- a/tools/gate/config-templates/bootstrap-armada-config.yaml
+++ b/tools/gate/config-templates/bootstrap-armada-config.yaml
@@ -566,6 +566,8 @@ data:
                 backend:
                   - mode tcp
                   - option tcpka
+                  - option tcp-check
+                  - option redispatch
           kube-system:
             kubernetes-etcd:
               server_opts: "check"
@@ -577,6 +579,8 @@ data:
                 backend:
                   - mode tcp
                   - option tcpka
+                  - option tcp-check
+                  - option redispatch
 
     images:
       tags: