diff --git a/submariner-operator/questions.yml b/submariner-operator/questions.yml
index f47a358..94fa251 100644
--- a/submariner-operator/questions.yml
+++ b/submariner-operator/questions.yml
@@ -136,3 +136,9 @@ questions:
   group: "Advanced Configuration"
   description: "Cable driver implementation"
   label: "Cable Driver"
+- variable: submariner.healthcheckEnabled
+  type: boolean
+  default: true
+  group: "Advanced Configuration"
+  description: "Disable Healtcheck, if your CNI does not expose a pod IP on the nodes"
+  label: "Healthcheck Disabled"
diff --git a/submariner-operator/templates/submariner.yaml b/submariner-operator/templates/submariner.yaml
index 040c570..457651f 100644
--- a/submariner-operator/templates/submariner.yaml
+++ b/submariner-operator/templates/submariner.yaml
@@ -25,3 +25,4 @@ spec:
   globalCIDR: "{{ .Values.submariner.globalCidr }}"
   serviceDiscoveryEnabled: {{ .Values.submariner.serviceDiscovery }}
   cableDriver: {{ .Values.submariner.cableDriver }}
+  connectionHealthCheck: {{ .Values.submariner.healthcheckEnabled }}
diff --git a/submariner-operator/values.yaml b/submariner-operator/values.yaml
index 82a6b5f..f4aa05b 100644
--- a/submariner-operator/values.yaml
+++ b/submariner-operator/values.yaml
@@ -10,6 +10,7 @@ submariner:
   debug: false
   serviceDiscovery: true
   cableDriver: "libreswan"
+  healthcheckEnabled: true
   images:
     repository: quay.io/submariner
     tag: "0.10.1"