diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml
index 5af56011eea..783f1c33bfa 100755
--- a/deployment/environments/group_vars/all/vitamui_vars.yml
+++ b/deployment/environments/group_vars/all/vitamui_vars.yml
@@ -92,7 +92,7 @@ vitamui:
 
   # Applications
   api_gateway:
-    host: "api-gateway.service.{{ consul_domain }}"
+    host: "vitamui-api-gateway.service.{{ consul_domain }}"
     vitamui_component: api-gateway
     port_service: 8090
     port_admin: 7090
@@ -120,7 +120,7 @@ vitamui:
     write_timeout: 30
 
   cas_server:
-    host: "cas-server.service.{{ consul_domain }}"
+    host: "vitamui-cas-server.service.{{ consul_domain }}"
     vitamui_component: cas-server
     port_service: 8001
     port_admin: 7001
diff --git a/deployment/roles/vitamui/templates/api-gateway/application.yml.j2 b/deployment/roles/vitamui/templates/api-gateway/application.yml.j2
index 9115a10f1c2..c355bde6378 100644
--- a/deployment/roles/vitamui/templates/api-gateway/application.yml.j2
+++ b/deployment/roles/vitamui/templates/api-gateway/application.yml.j2
@@ -28,7 +28,7 @@ authn:
 
 spring:
   application:
-    name: gateway-server
+    name: vitamui-{{ vitamui_struct.vitamui_component }}
   cloud:
     config:
       enabled: false
@@ -36,7 +36,7 @@ spring:
       enabled: true
       host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
-        serviceName: gateway-server
+        serviceName: vitamui-{{ vitamui_struct.vitamui_component }}
         preferIpAddress: true
         healthCheckUrl: http://${management.server.address}:${management.server.port}/actuator/health
         tags: {{ consul_tags }}
diff --git a/deployment/roles/vitamui/templates/cas-server/application.yml.j2 b/deployment/roles/vitamui/templates/cas-server/application.yml.j2
index b1bfbb748be..f5b56824f03 100644
--- a/deployment/roles/vitamui/templates/cas-server/application.yml.j2
+++ b/deployment/roles/vitamui/templates/cas-server/application.yml.j2
@@ -4,6 +4,7 @@ spring:
       enabled: true
       host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
+        serviceName: vitamui-{{ vitamui_struct.vitamui_component }}
         preferIpAddress: true
         healthCheckUrl: http://${management.server.address}:${management.server.port}/actuator/health
         tags: {{ consul_tags }}