diff --git a/helm-chart/templates/04-hub-deployment.yaml b/helm-chart/templates/04-hub-deployment.yaml
index 79383b2c4..74951a5e9 100644
--- a/helm-chart/templates/04-hub-deployment.yaml
+++ b/helm-chart/templates/04-hub-deployment.yaml
@@ -37,14 +37,18 @@ spec:
           imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
           readinessProbe:
             periodSeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
             initialDelaySeconds: 3
             tcpSocket:
-              port: 80
+              port: {{ .Values.tap.proxy.hub.srvport }}
           livenessProbe:
             periodSeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
             initialDelaySeconds: 3
             tcpSocket:
-              port: 80
+              port: {{ .Values.tap.proxy.hub.srvport }}
           resources:
             limits:
               cpu: {{ .Values.tap.resources.hub.limits.cpu }}
diff --git a/helm-chart/templates/06-front-deployment.yaml b/helm-chart/templates/06-front-deployment.yaml
index b7f934b44..b71c8a8b4 100644
--- a/helm-chart/templates/06-front-deployment.yaml
+++ b/helm-chart/templates/06-front-deployment.yaml
@@ -32,15 +32,17 @@ spec:
           imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
           name: kubeshark-front
           livenessProbe:
-            failureThreshold: 3
             periodSeconds: 1
+            failureThreshold: 3
             successThreshold: 1
+            initialDelaySeconds: 3
             tcpSocket:
               port: 80
           readinessProbe:
-            failureThreshold: 3
             periodSeconds: 1
+            failureThreshold: 3
             successThreshold: 1
+            initialDelaySeconds: 3
             tcpSocket:
               port: 80
             timeoutSeconds: 1
diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml
index 881b70387..34b63078d 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -73,12 +73,16 @@ spec:
                 - ALL
           readinessProbe:
             periodSeconds: 1
-            initialDelaySeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
+            initialDelaySeconds: 5
             tcpSocket:
               port: {{ .Values.tap.proxy.worker.srvport }}
           livenessProbe:
             periodSeconds: 1
-            initialDelaySeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
+            initialDelaySeconds: 5
             tcpSocket:
               port: {{ .Values.tap.proxy.worker.srvport }}
           volumeMounts:
diff --git a/manifests/complete.yaml b/manifests/complete.yaml
index b4649cad0..18f54184a 100644
--- a/manifests/complete.yaml
+++ b/manifests/complete.yaml
@@ -255,12 +255,16 @@ spec:
                 - ALL
           readinessProbe:
             periodSeconds: 1
-            initialDelaySeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
+            initialDelaySeconds: 5
             tcpSocket:
               port: 8897
           livenessProbe:
             periodSeconds: 1
-            initialDelaySeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
+            initialDelaySeconds: 5
             tcpSocket:
               port: 8897
           volumeMounts:
@@ -337,14 +341,18 @@ spec:
           imagePullPolicy: Always
           readinessProbe:
             periodSeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
             initialDelaySeconds: 3
             tcpSocket:
-              port: 80
+              port: 8898
           livenessProbe:
             periodSeconds: 1
+            failureThreshold: 3
+            successThreshold: 1
             initialDelaySeconds: 3
             tcpSocket:
-              port: 80
+              port: 8898
           resources:
             limits:
               cpu: 750m
@@ -389,15 +397,17 @@ spec:
           imagePullPolicy: Always
           name: kubeshark-front
           livenessProbe:
-            failureThreshold: 3
             periodSeconds: 1
+            failureThreshold: 3
             successThreshold: 1
+            initialDelaySeconds: 3
             tcpSocket:
               port: 80
           readinessProbe:
-            failureThreshold: 3
             periodSeconds: 1
+            failureThreshold: 3
             successThreshold: 1
+            initialDelaySeconds: 3
             tcpSocket:
               port: 80
             timeoutSeconds: 1