diff --git a/config/prow/cluster/prow_controller_manager_deployment.yaml b/config/prow/cluster/prow_controller_manager_deployment.yaml
index 1109e7fd19ec..fe26a33e3316 100644
--- a/config/prow/cluster/prow_controller_manager_deployment.yaml
+++ b/config/prow/cluster/prow_controller_manager_deployment.yaml
@@ -22,6 +22,11 @@ metadata:
 spec:
   # Mutually exclusive with plank. Only one of them may have more than zero replicas.
   replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
   revisionHistoryLimit: 2
   selector:
     matchLabels:
@@ -57,6 +62,18 @@ spec:
         - name: job-config
           mountPath: /etc/job-config
           readOnly: true
+        livenessProbe: # Pod is killed if this fails 3 times.
+          httpGet:
+            path: /healthz
+            port: 8081
+          initialDelaySeconds: 10
+          periodSeconds: 5
+        readinessProbe: # Pod is not considered ready (for rolling deploy and request routing) if this fails 3 times.
+          httpGet:
+            path: /healthz/ready
+            port: 8081
+          initialDelaySeconds: 10
+          periodSeconds: 3
       volumes:
       - name: kubeconfig
         secret: