diff --git a/playbooks/roles/services/deploy/cloud/templates/hosts b/playbooks/roles/services/deploy/cloud/templates/hosts
index b44bfce..ee69715 100644
--- a/playbooks/roles/services/deploy/cloud/templates/hosts
+++ b/playbooks/roles/services/deploy/cloud/templates/hosts
@@ -3,7 +3,7 @@
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
-127.0.1.1       cloud
+127.0.1.1       pod-cloud
 
 {{ services_all_services['database'].inet6_address }} pod-database
 {{ services_all_services['database'].inet_address }} pod-database
diff --git a/playbooks/roles/services/deploy/dash/templates/hosts b/playbooks/roles/services/deploy/dash/templates/hosts
index 4650053..8faaf8d 100644
--- a/playbooks/roles/services/deploy/dash/templates/hosts
+++ b/playbooks/roles/services/deploy/dash/templates/hosts
@@ -3,7 +3,7 @@
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
-127.0.1.1       dash
+127.0.1.1       pod-dash
 
 {{ services_all_services.metrics.inet6_address }} pod-metrics
 {{ services_all_services.metrics.inet_address }} pod-metrics
diff --git a/playbooks/roles/services/deploy/git/templates/hosts b/playbooks/roles/services/deploy/git/templates/hosts
index 0961cb2..37dc691 100644
--- a/playbooks/roles/services/deploy/git/templates/hosts
+++ b/playbooks/roles/services/deploy/git/templates/hosts
@@ -3,7 +3,7 @@
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
-127.0.1.1       git
+127.0.1.1       pod-git
 
 {{ services_all_services['database'].inet6_address }} pod-database
 {{ services_all_services['database'].inet_address }} pod-database
diff --git a/playbooks/roles/services/deploy/metrics/templates/hosts b/playbooks/roles/services/deploy/metrics/templates/hosts
index 84b8106..e8b4845 100644
--- a/playbooks/roles/services/deploy/metrics/templates/hosts
+++ b/playbooks/roles/services/deploy/metrics/templates/hosts
@@ -3,7 +3,7 @@
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
-127.0.1.1       metrics
+127.0.1.1       pod-metrics
 
 {{ services_host_services.metrics.target_inet6 }} metrics-target
 {{ services_host_services.metrics.target_inet }} metrics-target
diff --git a/playbooks/roles/services/deploy/notes/templates/hosts b/playbooks/roles/services/deploy/notes/templates/hosts
index 607b27e..98f23a8 100644
--- a/playbooks/roles/services/deploy/notes/templates/hosts
+++ b/playbooks/roles/services/deploy/notes/templates/hosts
@@ -3,7 +3,7 @@
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
-127.0.1.1       notes
+127.0.1.1       pod-notes
 
 {{ services_all_services['database'].inet6_address }} pod-database
 {{ services_all_services['database'].inet_address }} pod-database