diff --git a/src/main/k8s/production.yml b/src/main/k8s/production.yml
index 7665f54ff0ab6104b8c9fe841c03430247b2e803..1fc44cc5b1e51619275cd0208c0fdf45b1c0149f 100644
--- a/src/main/k8s/production.yml
+++ b/src/main/k8s/production.yml
@@ -41,6 +41,26 @@ spec:
           requests:
             cpu: 200m
             memory: 1Gi
+        startupProbe:
+            httpGet:
+              path: /geoip/q/health
+              port: 8080
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 35
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+        livenessProbe:
+            httpGet:
+              path: /geoip/q/health
+              port: 8080
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 60
+            periodSeconds: 60
+            successThreshold: 1
+            failureThreshold: 3
 ---
 apiVersion: "v1"
 kind: "Service"
diff --git a/src/main/k8s/staging.yml b/src/main/k8s/staging.yml
index fa2385994e5b58ccdd8939f070fefff1beaf3a63..d65341ea7cc9fc4d1647abf7f84e578a3db4b484 100644
--- a/src/main/k8s/staging.yml
+++ b/src/main/k8s/staging.yml
@@ -36,11 +36,31 @@ spec:
         - containerPort: 8080
         resources:
           limits:
-            cpu: 500m
-            memory: 1Gi
+            cpu: 300m
+            memory: 512Mi
           requests:
-            cpu: 100m
-            memory: 1Gi
+            cpu: 300m
+            memory: 512Mi
+        startupProbe:
+            httpGet:
+              path: /geoip/q/health
+              port: 8080
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 35
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+        livenessProbe:
+            httpGet:
+              path: /geoip/q/health
+              port: 8080
+              scheme: HTTP
+            timeoutSeconds: 1
+            initialDelaySeconds: 60
+            periodSeconds: 60
+            successThreshold: 1
+            failureThreshold: 3
 ---
 apiVersion: "v1"
 kind: "Service"