diff --git a/apps/base/osint-dashboard/templates/api/configmap.yaml b/apps/base/osint-dashboard/templates/api/configmap.yaml
index 21190fd..95829d3 100644
--- a/apps/base/osint-dashboard/templates/api/configmap.yaml
+++ b/apps/base/osint-dashboard/templates/api/configmap.yaml
@@ -11,9 +11,9 @@ data:
   DB_HOST: "{{ .Values.postgresql.clusterName }}-rw.{{ .Values.namespace }}.svc.cluster.local"
   DB_PORT: "{{ .Values.postgresql.port | default \"5432\" }}"
   DB_NAME: "{{ .Values.postgresql.database | default \"osint_data\" }}"
-  NATS_URLS: "nats://{{ include \"osint-dashboard.fullname\" . }}-nats.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.nats.ports.client }}"
-  REDIS_URL: "redis://{{ include \"osint-dashboard.fullname\" . }}-redis.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.redis.ports.redis }}/0"
-  MINIO_ENDPOINT: "{{ include \"osint-dashboard.fullname\" . }}-minio.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.minio.ports.api }}"
+  NATS_URLS: "nats://nats.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.nats.ports.client }}"
+  REDIS_URL: "redis://redis-master.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.redis.ports.redis }}/0"
+  MINIO_ENDPOINT: "minio.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.minio.ports.api }}"
   MINIO_BUCKET_VIDEO: "{{ .Values.minio.buckets.0.name | default \"osint-video-clips\" }}"
   MINIO_BUCKET_SATELLITE: "{{ .Values.minio.buckets.1.name | default \"osint-satellite-tiles\" }}"
   MINIO_BUCKET_DATA: "{{ .Values.minio.buckets.2.name | default \"osint-data-dumps\" }}"
diff --git a/apps/base/osint-dashboard/templates/nats/configmap.yaml b/apps/base/osint-dashboard/templates/nats/configmap.yaml
new file mode 100644
index 0000000..f01099a
--- /dev/null
+++ b/apps/base/osint-dashboard/templates/nats/configmap.yaml
@@ -0,0 +1,44 @@
+{{- if .Values.nats.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nats-config
+  namespace: {{ .Values.namespace }}
+  labels:
+    {{- include "osint-dashboard.labels" . | nindent 4 }}
+data:
+  nats-server.conf: |
+    port: {{ .Values.nats.ports.client }}
+    server_name: "osint-nats-${HOSTNAME}"
+    
+    # Cluster
+    cluster {
+      port: {{ .Values.nats.ports.cluster }}
+      routes: [
+        nats-route://nats-0.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }},
+        nats-route://nats-1.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }},
+        nats-route://nats-2.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }}
+      ]
+      cluster_advertise: "nats-${HOSTNAME}.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }}"
+    }
+    
+    # JetStream
+    jetstream {
+      store_dir: "{{ .Values.nats.jetstream.fileStore }}"
+      max_mem_store: {{ .Values.nats.jetstream.maxMemory }}
+      max_file_store: {{ .Values.nats.storage.size }}
+    }
+    
+    # Monitoring
+    monitor: {{ .Values.nats.ports.monitor }}
+    
+    # WebSocket
+    websocket {
+      port: {{ .Values.nats.ports.websocket }}
+      no_tls: true
+    }
+    
+    # Logging
+    logtime: true
+    log_file: /var/log/nats/nats.log
+{{- end }}
diff --git a/apps/base/osint-dashboard/templates/nats/statefulset.yaml b/apps/base/osint-dashboard/templates/nats/statefulset.yaml
index 74cbb85..592a98e 100644
--- a/apps/base/osint-dashboard/templates/nats/statefulset.yaml
+++ b/apps/base/osint-dashboard/templates/nats/statefulset.yaml
@@ -1,47 +1,4 @@
 {{- if .Values.nats.enabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nats-config
-  namespace: {{ .Values.namespace }}
-  labels:
-    {{- include "osint-dashboard.labels" . | nindent 4 }}
-data:
-  nats-server.conf: |
-    port: {{ .Values.nats.ports.client }}
-    server_name: "osint-nats-${HOSTNAME}"
-    
-    # Cluster
-    cluster {
-      port: {{ .Values.nats.ports.cluster }}
-      routes: [
-        nats-route://nats-0.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }},
-        nats-route://nats-1.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }},
-        nats-route://nats-2.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }}
-      ]
-      cluster_advertise: "nats-${HOSTNAME}.nats-cluster.{{ .Values.namespace }}.svc:{{ .Values.nats.ports.cluster }}"
-    }
-    
-    # JetStream
-    jetstream {
-      store_dir: "{{ .Values.nats.jetstream.fileStore }}"
-      max_mem_store: {{ .Values.nats.jetstream.maxMemory }}
-      max_file_store: {{ .Values.nats.storage.size }}
-    }
-    
-    # Monitoring
-    monitor: {{ .Values.nats.ports.monitor }}
-    
-    # WebSocket
-    websocket {
-      port: {{ .Values.nats.ports.websocket }}
-      no_tls: true
-    }
-    
-    # Logging
-    logtime: true
-    log_file: /var/log/nats/nats.log
----
 apiVersion: apps/v1
 kind: StatefulSet
 metadata: