diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index 283a80ed..83488bfc 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -124,11 +124,6 @@ module "hackmd" {
   depends_on = [null_resource.core_services]
 }
 
-# TODO
-# module "ingress-nginx" {
-#   source = "./ingress-nginx"
-# }
-
 # module "kafka" {
 #   source                         = "./kafka"
 #   client_certificate_secret_name = var.client_certificate_secret_name
@@ -363,10 +358,10 @@ module "nginx-ingress" {
   crowdsec_captcha_site_key   = var.ingress_crowdsec_captcha_site_key
 }
 
-module "crowdsec" {
-  source          = "./crowdsec"
-  tls_secret_name = var.tls_secret_name
-}
+# module "crowdsec" {
+#   source          = "./crowdsec"
+#   tls_secret_name = var.tls_secret_name
+# }
 
 # Seems like it needs S3 even if pg is local...
 # module "resume" {
@@ -430,10 +425,10 @@ module "cloudflared" {
 #   tls_secret_name = var.tls_secret_name
 # }
 
-module "metrics-server" {
-  source          = "./metrics-server"
-  tls_secret_name = var.tls_secret_name
-}
+# module "metrics-server" {
+#   source          = "./metrics-server"
+#   tls_secret_name = var.tls_secret_name
+# }
 
 module "paperless-ngx" {
   source          = "./paperless-ngx"
@@ -446,10 +441,10 @@ module "jsoncrack" {
   tls_secret_name = var.tls_secret_name
 }
 
-module "servarr" {
-  source          = "./servarr"
-  tls_secret_name = var.tls_secret_name
-}
+# module "servarr" {
+#   source          = "./servarr"
+#   tls_secret_name = var.tls_secret_name
+# }
 
 # module "dnscat2" {
 #   source = "./dnscat2"
diff --git a/modules/kubernetes/monitoring/main.tf b/modules/kubernetes/monitoring/main.tf
index e74afde3..30460f84 100644
--- a/modules/kubernetes/monitoring/main.tf
+++ b/modules/kubernetes/monitoring/main.tf
@@ -214,6 +214,7 @@ resource "helm_release" "grafana" {
   namespace        = "monitoring"
   create_namespace = true
   name             = "grafana"
+  atomic           = true
 
   repository = "https://grafana.github.io/helm-charts"
   chart      = "grafana"
diff --git a/modules/kubernetes/monitoring/prometheus_chart_values.tpl b/modules/kubernetes/monitoring/prometheus_chart_values.tpl
index 501179c4..fff54f7b 100644
--- a/modules/kubernetes/monitoring/prometheus_chart_values.tpl
+++ b/modules/kubernetes/monitoring/prometheus_chart_values.tpl
@@ -74,7 +74,7 @@ server:
     # enabled: false
     existingClaim: prometheus-iscsi-pvc
     # storageClass: rook-cephfs
-  retention: "12w" # ~100GB storage
+  retention: "8w" # ~70GB storage
   strategy:
     type: Recreate
   baseURL: "https://prometheus.viktorbarzin.me"