diff --git a/argocd/helm-values.yaml b/argocd/helm-values.yaml
index 44d5407..2eda91a 100644
--- a/argocd/helm-values.yaml
+++ b/argocd/helm-values.yaml
@@ -54,6 +54,8 @@ controller:
     service:
       enabled: true
       servicePort: 8082
+    serviceMonitor:
+      enabled: true
 
   # Memory optimization environment variables
   env:
@@ -84,6 +86,8 @@ server:
     service:
       enabled: true
       servicePort: 8083
+    serviceMonitor:
+      enabled: true
 
   # Main Ingress with Authelia middleware
   ingress:
@@ -113,6 +117,8 @@ repoServer:
     service:
       enabled: true
       servicePort: 8084
+    serviceMonitor:
+      enabled: true
 
   resources:
     requests:
diff --git a/cert-manager/helm-values.yaml b/cert-manager/helm-values.yaml
index e3eab54..cffd4f0 100644
--- a/cert-manager/helm-values.yaml
+++ b/cert-manager/helm-values.yaml
@@ -66,5 +66,5 @@ affinity:
 prometheus:
   enabled: true
   servicemonitor:
-    enabled: true  # Enable ServiceMonitor for Prometheus scraping
+    enabled: false