diff --git a/.gitlab/development-values.yaml b/.gitlab/development-values.yaml
index 66028e145be4f518daef5729b1e732a3bf2ce1af..1a756bdf674a82cb4ea5b816851e6bd00bb1dfd8 100644
--- a/.gitlab/development-values.yaml
+++ b/.gitlab/development-values.yaml
@@ -8,10 +8,14 @@ podDisruptionBudget:
   enabled: true
   minAvailable: 1
   maxUnavailable:
+podAnnotations:
+  prometheus.io/scrape: "true"
+  prometheus.io/path: /metrics
+  prometheus.io/port: "80"
 ingress:
   annotations:
     certmanager.k8s.io/cluster-issuer: letsencrypt-prod
     nginx.ingress.kubernetes.io/configuration-snippet: |
       if ($host = "www.metager3.de") {
           return 301 https://metager3.de$request_uri;
-      }
\ No newline at end of file
+      }
diff --git a/.gitlab/production-values.yaml b/.gitlab/production-values.yaml
index 1855172fc1919d5d85da663e5b507c9f7bc3b793..9d9541ad96b961592b96a7bc2c19795a1e5ba4e4 100644
--- a/.gitlab/production-values.yaml
+++ b/.gitlab/production-values.yaml
@@ -6,8 +6,12 @@ hpa:
   maxReplicas: 25
 podDisruptionBudget:
   enabled: true
-  minAvailable: 5
+  minAvailable: 4
   maxUnavailable:
+podAnnotations:
+  prometheus.io/scrape: "true"
+  prometheus.io/path: /metrics
+  prometheus.io/port: "80"
 ingress:
   annotations:
     certmanager.k8s.io/cluster-issuer: letsencrypt-prod
diff --git a/chart/values.yaml b/chart/values.yaml
index f4508a0baf071005b5a9876c66f9a17feca716bc..0641dce2ad6efb74a0e22bf123e485308987a060 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -50,13 +50,13 @@ prometheus:
   metrics: false
 livenessProbe:
   path: "/"
-  initialDelaySeconds: 40
+  initialDelaySeconds: 20
   timeoutSeconds: 15
   scheme: "HTTP"
   probeType: "httpGet"
 readinessProbe:
   path: "/"
-  initialDelaySeconds: 30
+  initialDelaySeconds: 15
   timeoutSeconds: 15
   scheme: "HTTP"
   probeType: "httpGet"