diff --git a/cluster/argocd/values.yaml b/cluster/argocd/values.yaml
index c518e9e..0b45eb4 100644
--- a/cluster/argocd/values.yaml
+++ b/cluster/argocd/values.yaml
@@ -112,3 +112,28 @@ dex:
 # Disable default admin user
 admin:
   enabled: false
+
+# Enable Prometheus metrics for ArgoCD
+controller:
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
+
+server:
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
+
+repoServer:
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
+
+applicationSet:
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
\ No newline at end of file
diff --git a/cluster/platform/cert-manager/values.yaml b/cluster/platform/cert-manager/values.yaml
index b829e6e..38be557 100644
--- a/cluster/platform/cert-manager/values.yaml
+++ b/cluster/platform/cert-manager/values.yaml
@@ -20,4 +20,4 @@ extraArgs:
 prometheus:
   enabled: true
   servicemonitor:
-    enabled: false   # enable once Prometheus operator is in-cluster
+    enabled: true
\ No newline at end of file