diff --git a/jupyterhub/templates/hub/deployment.yaml b/jupyterhub/templates/hub/deployment.yaml
index cd3d87185a..d47d8cdd6a 100644
--- a/jupyterhub/templates/hub/deployment.yaml
+++ b/jupyterhub/templates/hub/deployment.yaml
@@ -179,3 +179,11 @@ spec:
           ports:
             - containerPort: 8081
               name: hub
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: hub
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: hub
diff --git a/jupyterhub/templates/proxy/deployment.yaml b/jupyterhub/templates/proxy/deployment.yaml
index 75e45dfe85..1671224aff 100644
--- a/jupyterhub/templates/proxy/deployment.yaml
+++ b/jupyterhub/templates/proxy/deployment.yaml
@@ -101,3 +101,11 @@ spec:
               name: proxy-public
             - containerPort: 8001
               name: api
+          livenessProbe:
+            httpGet:
+              path: /_chp_healthz
+              port: proxy-public
+          readinessProbe:
+            httpGet:
+              path: /health  # Wait until hub is ready (this is proxied to hub)
+              port: proxy-public