diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml
index 226b7fc888..1db6b4b3fc 100644
--- a/deployment/aodh/aodh-base.yaml
+++ b/deployment/aodh/aodh-base.yaml
@@ -103,8 +103,5 @@ outputs:
         mysql:
           aodh::db::mysql::user: aodh
           aodh::db::mysql::password: {get_param: AodhPassword}
-          aodh::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          aodh::db::mysql::host: '%'
           aodh::db::mysql::dbname: aodh
-          aodh::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml
index 2e9453608c..56b39e32f2 100644
--- a/deployment/barbican/barbican-api-container-puppet.yaml
+++ b/deployment/barbican/barbican-api-container-puppet.yaml
@@ -284,11 +284,8 @@ outputs:
           - mysql:
               barbican::db::mysql::password: {get_param: BarbicanPassword}
               barbican::db::mysql::user: barbican
-              barbican::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+              barbican::db::mysql::host: '%'
               barbican::db::mysql::dbname: barbican
-              barbican::db::mysql::allowed_hosts:
-                - '%'
-                - "%{hiera('mysql_bind_host')}"
             keystone:
               tripleo::profile::base::keystone::barbican_notification_topics: ['barbican_notifications']
       # BEGIN DOCKER SETTINGS
diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index 5bbca020f7..0724cf8b0a 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -214,11 +214,8 @@ outputs:
         mysql:
           cinder::db::mysql::password: {get_param: CinderPassword}
           cinder::db::mysql::user: cinder
-          cinder::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          cinder::db::mysql::host: '%'
           cinder::db::mysql::dbname: cinder
-          cinder::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder
diff --git a/deployment/deprecated/mistral/mistral-base.yaml b/deployment/deprecated/mistral/mistral-base.yaml
index 077ad1ba55..7ab68ad9d6 100644
--- a/deployment/deprecated/mistral/mistral-base.yaml
+++ b/deployment/deprecated/mistral/mistral-base.yaml
@@ -116,9 +116,6 @@ outputs:
       service_config_settings:
         mysql:
           mistral::db::mysql::user: mistral
-          mistral::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          mistral::db::mysql::host: '%'
           mistral::db::mysql::dbname: mistral
           mistral::db::mysql::password: {get_param: MistralPassword}
-          mistral::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
diff --git a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml
index 93c0853b40..35cfd921c1 100644
--- a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml
+++ b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml
@@ -255,12 +255,9 @@ outputs:
             - zaqar_management_store_sqlalchemy
             - mysql:
                 zaqar::db::mysql::user: zaqar
-                zaqar::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+                zaqar::db::mysql::host: '%'
                 zaqar::db::mysql::dbname: zaqar
                 zaqar::db::mysql::password: {get_param: ZaqarPassword}
-                zaqar::db::mysql::allowed_hosts:
-                  - '%'
-                  - "%{hiera('mysql_bind_host')}"
             - {}
       # BEGIN DOCKER SETTINGS
       puppet_config:
diff --git a/deployment/designate/designate-central-container-puppet.yaml b/deployment/designate/designate-central-container-puppet.yaml
index 27efab6f8f..81d78d1807 100644
--- a/deployment/designate/designate-central-container-puppet.yaml
+++ b/deployment/designate/designate-central-container-puppet.yaml
@@ -137,11 +137,8 @@ outputs:
         mysql:
           designate::db::mysql::password: {get_param: DesignatePassword}
           designate::db::mysql::user: designate
-          designate::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          designate::db::mysql::host: '%'
           designate::db::mysql::dbname: designate
-          designate::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: designate
diff --git a/deployment/designate/designate-mdns-container-puppet.yaml b/deployment/designate/designate-mdns-container-puppet.yaml
index d81935e905..c1d70a2b6a 100644
--- a/deployment/designate/designate-mdns-container-puppet.yaml
+++ b/deployment/designate/designate-mdns-container-puppet.yaml
@@ -120,11 +120,8 @@ outputs:
         mysql:
           designate::db::mysql::password: {get_param: DesignatePassword}
           designate::db::mysql::user: designate
-          designate::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          designate::db::mysql::host: '%'
           designate::db::mysql::dbname: designate
-          designate::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: designate
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index d6a6cd7a2e..2e17b8e328 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -608,11 +608,8 @@ outputs:
         mysql:
           glance::db::mysql::password: {get_param: GlancePassword}
           glance::db::mysql::user: glance
-          glance::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          glance::db::mysql::host: '%'
           glance::db::mysql::dbname: glance
-          glance::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
         rsyslog:
           tripleo_logging_sources_glance_api:
             - {get_param: GlanceApiLoggingSource}
diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
index 36b6d9141b..0c471ac394 100644
--- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
@@ -241,11 +241,8 @@ outputs:
             mysql:
               gnocchi::db::mysql::password: {get_param: GnocchiPassword}
               gnocchi::db::mysql::user: gnocchi
-              gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+              gnocchi::db::mysql::host: '%'
               gnocchi::db::mysql::dbname: gnocchi
-              gnocchi::db::mysql::allowed_hosts:
-                - '%'
-                - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: gnocchi
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index fb533bf14d..fb79703f94 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -203,11 +203,8 @@ outputs:
         mysql:
           heat::db::mysql::password: {get_param: HeatPassword}
           heat::db::mysql::user: heat
-          heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          heat::db::mysql::host: '%'
           heat::db::mysql::dbname: heat
-          heat::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: heat
diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml
index 0e501d7bf6..eb7eeffaab 100644
--- a/deployment/ironic/ironic-api-container-puppet.yaml
+++ b/deployment/ironic/ironic-api-container-puppet.yaml
@@ -228,11 +228,8 @@ outputs:
         mysql:
           ironic::db::mysql::password: {get_param: IronicPassword}
           ironic::db::mysql::user: ironic
-          ironic::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          ironic::db::mysql::host: '%'
           ironic::db::mysql::dbname: ironic
-          ironic::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: ironic_api
diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml
index 8b2b9cb19d..cb643a1d44 100644
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@@ -383,11 +383,8 @@ outputs:
         mysql:
           ironic::inspector::db::mysql::password: {get_param: IronicPassword}
           ironic::inspector::db::mysql::user: ironic-inspector
-          ironic::inspector::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          ironic::inspector::db::mysql::host: '%'
           ironic::inspector::db::mysql::dbname: ironic-inspector
-          ironic::inspector::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: ironic_inspector
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index f7f5ba1285..666cc99404 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -625,11 +625,8 @@ outputs:
               - {get_param: AdminToken}
               - {get_param: KeystonePassword}
           keystone::db::mysql::user: keystone
-          keystone::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          keystone::db::mysql::host: '%'
           keystone::db::mysql::dbname: keystone
-          keystone::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
         pacemaker:
           keystone::endpoint::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
           keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml
index 9cea2f4a77..477a74caed 100644
--- a/deployment/manila/manila-base.yaml
+++ b/deployment/manila/manila-base.yaml
@@ -97,8 +97,5 @@ outputs:
         mysql:
           manila::db::mysql::password: {get_param: ManilaPassword}
           manila::db::mysql::user: manila
-          manila::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          manila::db::mysql::host: '%'
           manila::db::mysql::dbname: manila
-          manila::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index c1dbfa1386..7b45ccedf6 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -424,11 +424,8 @@ outputs:
         mysql:
           neutron::db::mysql::password: {get_param: NeutronPassword}
           neutron::db::mysql::user: neutron
-          neutron::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          neutron::db::mysql::host: '%'
           neutron::db::mysql::dbname: ovs_neutron
-          neutron::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
 
       # BEGIN DOCKER SETTINGS
       puppet_config:
diff --git a/deployment/nova/nova-apidb-client-puppet.yaml b/deployment/nova/nova-apidb-client-puppet.yaml
index ff5cc9e926..58ffe9f11b 100644
--- a/deployment/nova/nova-apidb-client-puppet.yaml
+++ b/deployment/nova/nova-apidb-client-puppet.yaml
@@ -63,8 +63,5 @@ outputs:
         mysql:
           nova::db::mysql_api::password: {get_param: NovaPassword}
           nova::db::mysql_api::user: nova_api
-          nova::db::mysql_api::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          nova::db::mysql_api::host: '%'
           nova::db::mysql_api::dbname: nova_api
-          nova::db::mysql_api::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
diff --git a/deployment/nova/nova-db-client-puppet.yaml b/deployment/nova/nova-db-client-puppet.yaml
index a4efe12088..196647ec2b 100644
--- a/deployment/nova/nova-db-client-puppet.yaml
+++ b/deployment/nova/nova-db-client-puppet.yaml
@@ -63,8 +63,5 @@ outputs:
         mysql:
           nova::db::mysql::password: {get_param: NovaPassword}
           nova::db::mysql::user: nova
-          nova::db::mysql::host: {get_param: [EndpointMap, MysqlCellInternal, host_nobrackets]}
+          nova::db::mysql::host: '%'
           nova::db::mysql::dbname: nova
-          nova::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml
index d22cba5260..8039d566f9 100644
--- a/deployment/octavia/octavia-api-container-puppet.yaml
+++ b/deployment/octavia/octavia-api-container-puppet.yaml
@@ -215,11 +215,8 @@ outputs:
         mysql:
           octavia::db::mysql::password: {get_param: OctaviaPassword}
           octavia::db::mysql::user: {get_param: OctaviaUserName}
-          octavia::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          octavia::db::mysql::host: '%'
           octavia::db::mysql::dbname: octavia
-          octavia::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: octavia
diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml
index be37867286..ae5471b28a 100644
--- a/deployment/placement/placement-api-container-puppet.yaml
+++ b/deployment/placement/placement-api-container-puppet.yaml
@@ -197,11 +197,8 @@ outputs:
         mysql:
           placement::db::mysql::password: {get_param: PlacementPassword}
           placement::db::mysql::user: placement
-          placement::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          placement::db::mysql::host: '%'
           placement::db::mysql::dbname: placement
-          placement::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: placement