diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 0370da5b1c..40060a116d 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -99,7 +99,7 @@ outputs:
         ceilometer::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         ceilometer::rabbit_port: {get_param: RabbitClientPort}
         ceilometer::db::mysql::user: ceilometer
-        ceilometer::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+        ceilometer::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
         ceilometer::db::mysql::dbname: ceilometer
         ceilometer::db::mysql::allowed_hosts:
           - '%'
diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index b6ffdec086..adacc73770 100644
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -58,7 +58,7 @@ outputs:
         cinder::rabbit_password: {get_param: RabbitPassword}
         cinder::rabbit_port: {get_param: RabbitClientPort}
         cinder::db::mysql::user: cinder
-        cinder::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+        cinder::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
         cinder::db::mysql::dbname: cinder
         cinder::db::mysql::allowed_hosts:
           - '%'
diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
index ea96fc52fb..6d2144e18c 100644
--- a/puppet/services/glance-registry.yaml
+++ b/puppet/services/glance-registry.yaml
@@ -43,7 +43,7 @@ outputs:
         glance::registry::debug: {get_param: Debug}
         glance::registry::workers: {get_param: GlanceWorkers}
         glance::db::mysql::user: glance
-        glance::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+        glance::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
         glance::db::mysql::dbname: glance
         glance::db::mysql::allowed_hosts:
           - '%'
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index f69dfd03ac..fa00f736e8 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -85,7 +85,7 @@ outputs:
         gnocchi::statsd::flush_delay: 10
         gnocchi::statsd::archive_policy_name: 'low'
         gnocchi::db::mysql::user: gnocchi
-        gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlVirtual, host]}
+        gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
         gnocchi::db::mysql::dbname: gnocchi
         gnocchi::db::mysql::allowed_hosts:
           - '%'
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index eb8534fc3a..2fd018853a 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -56,7 +56,7 @@ outputs:
             heat::db::mysql::password: {get_param: HeatPassword}
             heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
             heat::db::mysql::user: heat
-            heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+            heat::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
             heat::db::mysql::dbname: heat
             heat::db::mysql::allowed_hosts:
               - '%'
diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml
index c9f6d68044..6efef6182c 100644
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@ -67,7 +67,7 @@ outputs:
             neutron::server::notifications::password: {get_param: NovaPassword}
             neutron::db::mysql::password: {get_param: NeutronPassword}
             neutron::db::mysql::user: neutron
-            neutron::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+            neutron::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
             neutron::db::mysql::dbname: ovs_neutron
             neutron::db::mysql::allowed_hosts:
               - '%'
diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml
index 4cd9325721..b799e27c75 100644
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@@ -39,7 +39,7 @@ outputs:
             sahara::database_connection: *sahara_dsn
             sahara::db::mysql::password: {get_param: SaharaPassword}
             sahara::db::mysql::user: sahara
-            sahara::db::mysql::host: {get_param: [EndpointMap, MysqlVirtual, host]}
+            sahara::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
             sahara::db::mysql::dbname: sahara
             sahara::db::mysql::allowed_hosts:
               - '%'