diff --git a/deployment/database/mysql-base.yaml b/deployment/database/mysql-base.yaml
index 52aeea183d..e672db316d 100644
--- a/deployment/database/mysql-base.yaml
+++ b/deployment/database/mysql-base.yaml
@@ -137,12 +137,6 @@ outputs:
               "%{hiera('fqdn_$NETWORK')}"
             params:
               $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
-        tripleo::profile::base::database::mysql::client_bind_address:
-          str_replace:
-            template:
-              "%{hiera('$NETWORK')}"
-            params:
-              $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
         tripleo::profile::base::database::mysql::generate_dropin_file_limit:
           {get_param: MysqlIncreaseFileLimit}
         tripleo::profile::base::database::mysql::certificate_specs:
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index 485aedcd26..01ab205d92 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -130,7 +130,7 @@ outputs:
                             expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
                         - {get_param: ContainerRedisImage}
                     expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
-            tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
+            tripleo::profile::pacemaker::database::redis_bundle::redis_docker_control_port: 3124
             tripleo::profile::pacemaker::database::redis_bundle::container_backend: {get_param: ContainerCli}
             tripleo::stunnel::manage_service: false
             tripleo::stunnel::foreground: 'yes'
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 2401fa27a9..cc8bd2c8fb 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -112,7 +112,7 @@ outputs:
                             expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
                         - {get_param: ContainerRabbitmqImage}
                     expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
-            tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
+            tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
             tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index e81c9fd32b..e36310537d 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -112,7 +112,7 @@ outputs:
                             expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
                         - {get_param: ContainerRabbitmqImage}
                     expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
-            tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
+            tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
             tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index 5ee3bc212f..8cd7190029 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -112,7 +112,7 @@ outputs:
                             expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
                         - {get_param: ContainerRabbitmqImage}
                     expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
-            tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
+            tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
             tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS