diff --git a/grafana/helm-values.yaml b/grafana/helm-values.yaml
index 8597bfc..89f3a55 100644
--- a/grafana/helm-values.yaml
+++ b/grafana/helm-values.yaml
@@ -38,7 +38,7 @@ datasources:
     - name: Prometheus
       type: prometheus
       access: proxy
-      url: http://prometheus-kube-prometheus-prometheus:9090
+      url: http://prometheus-kube-prometheus-prometheus.prometheus.svc.cluster.local:9090
       isDefault: true
       editable: true
     - name: Loki
diff --git a/prometheus/helm-values.yaml b/prometheus/helm-values.yaml
index bb44961..2f46459 100644
--- a/prometheus/helm-values.yaml
+++ b/prometheus/helm-values.yaml
@@ -70,6 +70,74 @@ prometheus:
         port: http
         scheme: http
 
+    # External labels added to all metrics
+    externalLabels:
+      cluster: "mayne-cluster"
+
+    additionalScrapeConfigs:
+      # ArgoCD metrics
+      - job_name: 'argocd-metrics'
+        static_configs:
+          - targets:
+            - 'argocd-metrics.argocd.svc.cluster.local:8082'
+            labels:
+              service: argocd-controller
+          - targets:
+            - 'argocd-server-metrics.argocd.svc.cluster.local:8083'
+            labels:
+              service: argocd-server
+          - targets:
+            - 'argocd-repo-server.argocd.svc.cluster.local:8084'
+            labels:
+              service: argocd-repo
+
+      # Cert-Manager
+      - job_name: 'cert-manager'
+        static_configs:
+          - targets:
+            - 'cert-manager.cert-manager.svc.cluster.local:9402'
+
+      # MinIO
+      - job_name: 'minio-cluster'
+        static_configs:
+          - targets:
+            - 'minio.minio.svc.cluster.local:9000'
+        metrics_path: /minio/v2/metrics/cluster
+        scheme: http
+
+      - job_name: 'minio-node'
+        static_configs:
+          - targets:
+            - 'minio.minio.svc.cluster.local:9000'
+        metrics_path: /minio/v2/metrics/node
+        scheme: http
+
+      # Ingress NGINX
+      - job_name: 'ingress-nginx'
+        kubernetes_sd_configs:
+          - role: pod
+            namespaces:
+              names:
+                - ingress-nginx
+        relabel_configs:
+          - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name]
+            action: keep
+            regex: ingress-nginx
+          - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_component]
+            action: keep
+            regex: controller
+          - source_labels: [__address__]
+            action: replace
+            regex: ([^:]+)(?::\d+)?
+            replacement: $1:10254
+            target_label: __address__
+          - source_labels: [__meta_kubernetes_pod_name]
+            action: replace
+            target_label: pod
+          - source_labels: [__meta_kubernetes_namespace]
+            action: replace
+            target_label: namespace
+
 # Alertmanager (기존 alertmanager 사용)
 alertmanager:
   enabled: false
@@ -119,73 +187,3 @@ defaultRules:
     prometheus: true
     prometheusOperator: true
 
-# Additional scrape configs for existing services
-prometheus:
-  prometheusSpec:
-    # External labels added to all metrics
-    externalLabels:
-      cluster: "mayne-cluster"
-
-    additionalScrapeConfigs:
-      # ArgoCD metrics
-      - job_name: 'argocd-metrics'
-        static_configs:
-          - targets:
-            - 'argocd-metrics.argocd.svc.cluster.local:8082'
-            labels:
-              service: argocd-controller
-          - targets:
-            - 'argocd-server-metrics.argocd.svc.cluster.local:8083'
-            labels:
-              service: argocd-server
-          - targets:
-            - 'argocd-repo-server.argocd.svc.cluster.local:8084'
-            labels:
-              service: argocd-repo
-      
-      # Cert-Manager
-      - job_name: 'cert-manager'
-        static_configs:
-          - targets:
-            - 'cert-manager.cert-manager.svc.cluster.local:9402'
-      
-      # MinIO
-      - job_name: 'minio-cluster'
-        static_configs:
-          - targets:
-            - 'minio.minio.svc.cluster.local:9000'
-        metrics_path: /minio/v2/metrics/cluster
-        scheme: http
-      
-      - job_name: 'minio-node'
-        static_configs:
-          - targets:
-            - 'minio.minio.svc.cluster.local:9000'
-        metrics_path: /minio/v2/metrics/node
-        scheme: http
-      
-      # Ingress NGINX
-      - job_name: 'ingress-nginx'
-        kubernetes_sd_configs:
-          - role: pod
-            namespaces:
-              names:
-                - ingress-nginx
-        relabel_configs:
-          - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name]
-            action: keep
-            regex: ingress-nginx
-          - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_component]
-            action: keep
-            regex: controller
-          - source_labels: [__address__]
-            action: replace
-            regex: ([^:]+)(?::\d+)?
-            replacement: $1:10254
-            target_label: __address__
-          - source_labels: [__meta_kubernetes_pod_name]
-            action: replace
-            target_label: pod
-          - source_labels: [__meta_kubernetes_namespace]
-            action: replace
-            target_label: namespace