diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
index d6c43536..bbef761a 100644
--- a/.kontinuous/values.yaml
+++ b/.kontinuous/values.yaml
@@ -4,6 +4,18 @@ app:
   ~needs: [build-app]
   imagePackage: app
   containerPort: 8080
+  livenessProbe:
+    httpGet:
+      path: /live
+      port: 8080
+  readinessProbe:
+    httpGet:
+      path: /ready
+      port: 8080
+  lifecycle:
+    preStop:
+      exec:
+        command: ["/pre-stop.sh", "10"]
 
 jobs:
   runs:
diff --git a/Dockerfile b/Dockerfile
index ebad46d6..2cb21dee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,8 @@ RUN if [ -z "$PRODUCTION" ]; then \
 RUN yarn fetch-tools production && yarn cache clean
 
 # Production image, copy all the files and run next
-FROM ghcr.io/socialgouv/docker/nginx:sha-1d70757 AS runner
+# FROM ghcr.io/socialgouv/docker/nginx:sha-1d70757 AS runner
+FROM ghcr.io/socialgouv/docker/nginx:feat-nginx-kube-zero-downtime AS runner
 
 COPY --from=builder /app/out /usr/share/nginx/html