diff --git a/deployment/templates/env-configmap.yaml b/deployment/templates/env-configmap.yaml
index e8d43ee..2af4830 100644
--- a/deployment/templates/env-configmap.yaml
+++ b/deployment/templates/env-configmap.yaml
@@ -6,7 +6,7 @@ data:
   ADDITIONAL_POSTGRES_DB: "analyzer_db,webserver_db,collector_test_db,analyzer_test_db,webserver_test_db"
   ANALYZER_DB: "analyzer_db"
   ANALYZER_EXCHANGE: "analyzer_exchange"
-  ANALYZER_HOST: "data-analyzer"
+  ANALYZER_HOST: "data-analyzer-service"
   ANALYZER_PORT: "8887"
   ANALYZER_QUEUE: "analyzer_queue"
   ANALYZER_ROUTING_KEY: "analyzer_key"
@@ -14,7 +14,7 @@ data:
   ANALYZER_TEST_EXCHANGE: "analyzer_test_exchange"
   COLLECTOR_DB: "collector_db"
   COLLECTOR_EXCHANGE: "collector_exchange"
-  COLLECTOR_HOST: "data-collector"
+  COLLECTOR_HOST: "data-collector-service"
   COLLECTOR_PORT: "8886"
   COLLECTOR_QUEUE: "collector_queue"
   COLLECTOR_ROUTING_KEY: "collector_key"
@@ -22,15 +22,15 @@ data:
   COLLECTOR_TEST_EXCHANGE: "collector_test_exchange"
   GRAFANA_PORT: "3000"
   POSTGRES_DB: "collector_db"
-  POSTGRES_HOST: "db-service"
+  POSTGRES_HOST: "db-service-service"
   POSTGRES_PORT: "5432"
   POSTGRES_USER: "newsanalyzer"
   PROJECT_VERSION: "0.0.1"
   PROMETHEUS_PORT: "9090"
-  RABBITMQ_HOST: "mq"
+  RABBITMQ_HOST: "mq-service"
   RABBITMQ_METRICS_PORT: "15692"
   RABBITMQ_PORT: "5672"
   WEBSERVER_DB: "webserver_db"
-  WEBSERVER_HOST: "web-server"
+  WEBSERVER_HOST: "web-server-service"
   WEBSERVER_PORT: "8888"
   WEBSERVER_TEST_DB: "webserver_test_db"
diff --git a/deployment/templates/grafana-configmap.yaml b/deployment/templates/grafana-configmap.yaml
index 1268327..2e9f02d 100644
--- a/deployment/templates/grafana-configmap.yaml
+++ b/deployment/templates/grafana-configmap.yaml
@@ -10,7 +10,7 @@ data:
       - name: Prometheus
         type: prometheus
         access: proxy # proxy (server in the UI) or direct (browser in the UI)
-        url: http://prometheus:9090
+        url: http://prometheus-service:9090
         jsonData:
           httpMethod: POST
           manageAlerts: true