diff --git a/k8s/roles/drone/tasks/main.yml b/k8s/roles/drone/tasks/main.yml
index 37c3c90..fdcee18 100644
--- a/k8s/roles/drone/tasks/main.yml
+++ b/k8s/roles/drone/tasks/main.yml
@@ -122,6 +122,11 @@
         - roles
         - rolebindings
         verbs: ["*"]
+      - apiGroups: ["monitoring.coreos.com"]
+        resources:
+        - podmonitors
+        - servicemonitors
+        verbs: ["*"]
 
 
 - name: Create Drone service account
@@ -161,7 +166,7 @@
     name: drone-session-cache
     chart_ref: enapter/keydb
     release_namespace: drone
-    chart_version: 0.48.0
+    chart_version: "0.48.0"
     update_repo_cache: true
     release_values: "{{ lookup('template', 'values.keydb.yml.j2') | from_yaml }}"
 
@@ -170,7 +175,7 @@
     name: drone
     chart_ref: drone/drone
     release_namespace: drone
-    chart_version: 0.6.3
+    chart_version: "0.6.3"
     update_repo_cache: true
     release_values: "{{ lookup('template', 'values.drone.yml.j2') | from_yaml }}"
 
diff --git a/k8s/roles/drone/templates/values.keydb.yml.j2 b/k8s/roles/drone/templates/values.keydb.yml.j2
index 38121fa..3059dd4 100644
--- a/k8s/roles/drone/templates/values.keydb.yml.j2
+++ b/k8s/roles/drone/templates/values.keydb.yml.j2
@@ -1,3 +1,8 @@
+imageRepository: code.icb4dc0.de/prskr/infrastructure/keydb
+imageTag: v6.3.2
+
+podDisruptionBudget:
+  enabled: true
 persistentVolume:
   enabled: false
 
@@ -15,4 +20,12 @@ serviceMonitor:
     prometheus: default
 
 exporter:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  imageTag: v1.51.0
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      cpu: 150m
+      memory: 100Mi
\ No newline at end of file
diff --git a/k8s/roles/gitea/templates/values.forgejo.yml.j2 b/k8s/roles/gitea/templates/values.forgejo.yml.j2
index e5aa543..29aacfe 100644
--- a/k8s/roles/gitea/templates/values.forgejo.yml.j2
+++ b/k8s/roles/gitea/templates/values.forgejo.yml.j2
@@ -1,3 +1,6 @@
+image:
+  rootless: true
+
 service:
   ssh:
     type: NodePort
diff --git a/k8s/roles/nextcloud/templates/values.nextcloud-keydb.yml.j2 b/k8s/roles/nextcloud/templates/values.nextcloud-keydb.yml.j2
index 5200adf..63036db 100644
--- a/k8s/roles/nextcloud/templates/values.nextcloud-keydb.yml.j2
+++ b/k8s/roles/nextcloud/templates/values.nextcloud-keydb.yml.j2
@@ -4,8 +4,10 @@ imageTag: v6.3.2
 nodes: 3
 podDisruptionBudget:
   enabled: true
+
 persistentVolume:
   enabled: false
+
 resources:
   requests:
     cpu: 50m
@@ -13,6 +15,7 @@ resources:
   limits:
     cpu: 250m
     memory: 256Mi
+
 exporter:
   enabled: true
   imageTag: v1.51.0
@@ -23,6 +26,7 @@ exporter:
     limits:
       cpu: 150m
       memory: 100Mi
+
 serviceMonitor:
   enabled: true
   labels: