diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index bc219fac4..5591e18ae 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -25,7 +25,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('aodh_api_bootstrap_node_name')
 #
 # [*oslomsg_rpc_proto*]
 #   Protocol driver for the oslo messaging rpc service
@@ -73,7 +73,7 @@
 
 class tripleo::profile::base::aodh (
   $step                    = Integer(hiera('step')),
-  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node          = hiera('aodh_api_bootstrap_node_name', undef),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('aodh::rabbit_password'),
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index 354490a37..7c9acba98 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -25,7 +25,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('aodh_api_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -51,7 +51,7 @@
 
 class tripleo::profile::base::aodh::api (
   $aodh_network                  = hiera('aodh_api_network', undef),
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('aodh_api_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $step                          = Integer(hiera('step')),
diff --git a/manifests/profile/base/barbican/api.pp b/manifests/profile/base/barbican/api.pp
index e85597e30..88f3a3545 100644
--- a/manifests/profile/base/barbican/api.pp
+++ b/manifests/profile/base/barbican/api.pp
@@ -25,7 +25,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('barbican_api_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -94,7 +94,7 @@
 
 class tripleo::profile::base::barbican::api (
   $barbican_network              = hiera('barbican_api_network', undef),
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('barbican_api_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $step                          = Integer(hiera('step')),
diff --git a/manifests/profile/base/barbican/backends.pp b/manifests/profile/base/barbican/backends.pp
index 35ec91a09..9f0c5d936 100644
--- a/manifests/profile/base/barbican/backends.pp
+++ b/manifests/profile/base/barbican/backends.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('barbican_api_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
diff --git a/manifests/profile/base/ceilometer/upgrade.pp b/manifests/profile/base/ceilometer/upgrade.pp
index 83c86b085..7d319aa12 100644
--- a/manifests/profile/base/ceilometer/upgrade.pp
+++ b/manifests/profile/base/ceilometer/upgrade.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -29,7 +29,7 @@
 #
 
 class tripleo::profile::base::ceilometer::upgrade (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 8eac76506..22f5fb29b 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('cinder_api_short_bootstrap_node_name')
 #
 # [*cinder_enable_db_purge*]
 #   (Optional) Wheter to enable db purging
@@ -75,7 +75,7 @@
 #   Defaults to hiera('cinder::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::cinder (
-  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node          = hiera('cinder_api_short_bootstrap_node_name', undef),
   $cinder_enable_db_purge  = true,
   $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index b55d0240f..84eac8e21 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('cinder_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -63,7 +63,7 @@
 #   Defaults to undef.
 #
 class tripleo::profile::base::cinder::api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('cinder_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $cinder_api_network            = hiera('cinder_api_network', undef),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
diff --git a/manifests/profile/base/congress.pp b/manifests/profile/base/congress.pp
index 424cd950a..8ebf464de 100644
--- a/manifests/profile/base/congress.pp
+++ b/manifests/profile/base/congress.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('congress_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
@@ -51,7 +51,7 @@
 #   Defaults to hiera('congress::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::congress (
-  $bootstrap_node       = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node       = hiera('congress_short_bootstrap_node_name', undef),
   $step                 = Integer(hiera('step')),
   $oslomsg_rpc_proto    = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp
index a21705ad0..8d53411cc 100644
--- a/manifests/profile/base/database/mongodb.pp
+++ b/manifests/profile/base/database/mongodb.pp
@@ -23,7 +23,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('mongodb_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -36,7 +36,7 @@
 #
 class tripleo::profile::base::database::mongodb (
   $mongodb_replset,
-  $bootstrap_node = downcase(hiera('bootstrap_nodeid')),
+  $bootstrap_node = downcase(hiera('mongodb_short_bootstrap_node_name')),
   $step           = Integer(hiera('step')),
   $memory_limit   = '20G',
 ) {
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 65116be0a..1bf507609 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -24,7 +24,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('mysql_short_bootstrap_node_name')
 #
 # [*certificate_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate
@@ -99,7 +99,7 @@
 #
 class tripleo::profile::base::database::mysql (
   $bind_address                  = $::hostname,
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('mysql_short_bootstrap_node_name', undef),
   $certificate_specs             = {},
   $cipher_list                   = '!SSLv2:kEECDH:kRSA:kEDH:kPSK:+3DES:!aNULL:!eNULL:!MD5:!EXP:!RC4:!SEED:!IDEA:!DES:!SSLv3:!TLSv1',
   $enable_internal_tls           = hiera('enable_internal_tls', false),
diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp
index 8d4ed94ca..4fde0f9cf 100644
--- a/manifests/profile/base/database/redis.pp
+++ b/manifests/profile/base/database/redis.pp
@@ -18,9 +18,9 @@
 #
 # === Parameters
 #
-# [*bootstrap_nodeid*]
+# [*redis_short_bootstrap_node_name*]
 #   (Optional) Hostname of Redis master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('redis_short_bootstrap_node_name')
 #
 # [*certificate_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -67,7 +67,7 @@
 #   defaults to 6379
 #
 class tripleo::profile::base::database::redis (
-  $bootstrap_nodeid    = hiera('bootstrap_nodeid'),
+  $redis_short_bootstrap_node_name    = hiera('redis_short_bootstrap_node_name'),
   $certificate_specs  = hiera('redis_certificate_specs', {}),
   $enable_internal_tls = hiera('enable_internal_tls', false),
   $redis_network       = hiera('redis_network', undef),
@@ -102,10 +102,10 @@ class tripleo::profile::base::database::redis (
         notify       => Class['::redis'],
       }
     }
-    if downcase($bootstrap_nodeid) == $::hostname {
+    if downcase($redis_short_bootstrap_node_name) == $::hostname {
       $slaveof = undef
     } else {
-      $slaveof = "${bootstrap_nodeid} 6379"
+      $slaveof = "${redis_short_bootstrap_node_name} 6379"
     }
     class { '::redis' :
       slaveof => $slaveof,
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 14fae70e6..6b454f167 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('glance_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -83,7 +83,7 @@
 #   RBD client naem
 #   (optional) Defaults to hiera('glance::backend::rbd::rbd_store_user')
 class tripleo::profile::base::glance::api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('glance_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $glance_backend                = downcase(hiera('glance_backend', 'swift')),
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index c499672f8..40b8014f4 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -69,7 +69,7 @@
 #   Defaults to hiera('incoming_storage_driver', undef)
 #
 class tripleo::profile::base::gnocchi::api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('gnocchi_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $gnocchi_backend               = downcase(hiera('gnocchi_backend', 'swift')),
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 696e9e6e3..5de185e44 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to downcase(hiera('bootstrap_nodeid'))
+#   Defaults to downcase(hiera('heat_engine_short_bootstrap_node_name'))
 #
 # [*manage_db_purge*]
 #   (Optional) Whether keystone token flushing should be enabled
@@ -76,7 +76,7 @@
 #   Defaults to hiera('heat::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::heat (
-  $bootstrap_node          = downcase(hiera('bootstrap_nodeid')),
+  $bootstrap_node          = downcase(hiera('heat_engine_short_bootstrap_node_name')),
   $manage_db_purge         = hiera('heat_enable_db_purge', true),
   $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index 46435bfb3..3984c49ed 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('heat_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -49,7 +49,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::heat::api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('heat_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $heat_api_network              = hiera('heat_api_network', undef),
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index a2f328734..ce6330206 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('heat_api_cfn_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -49,7 +49,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::heat::api_cfn (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('heat_api_cfn_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $heat_api_cfn_network          = hiera('heat_api_cfn_network', undef),
diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp
index b9b44d1d8..ac33ed6f6 100644
--- a/manifests/profile/base/heat/engine.pp
+++ b/manifests/profile/base/heat/engine.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('heat_engine_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::heat::engine (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('heat_engine_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index 157d0c0cc..307c7bb1f 100644
--- a/manifests/profile/base/horizon.pp
+++ b/manifests/profile/base/horizon.pp
@@ -25,7 +25,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('horizon_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -58,7 +58,7 @@
 #
 class tripleo::profile::base::horizon (
   $step                = Integer(hiera('step')),
-  $bootstrap_node      = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node      = hiera('horizon_short_bootstrap_node_name', undef),
   $certificates_specs  = hiera('apache_certificates_specs', {}),
   $enable_internal_tls = hiera('enable_internal_tls', false),
   $horizon_network     = hiera('horizon_network', undef),
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index 7e6efecc7..5bc6a04e5 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('ironic_api_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
@@ -51,7 +51,7 @@
 #   Defaults to hiera('ironic::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::ironic (
-  $bootstrap_node       = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node       = hiera('ironic_api_short_bootstrap_node_name', undef),
   $step                 = Integer(hiera('step')),
   $oslomsg_rpc_proto    = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
diff --git a/manifests/profile/base/ironic/api.pp b/manifests/profile/base/ironic/api.pp
index 78bf9db29..226b5bba9 100644
--- a/manifests/profile/base/ironic/api.pp
+++ b/manifests/profile/base/ironic/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('ironic_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -48,7 +48,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ironic::api (
-  $bootstrap_node      = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node      = hiera('ironic_api_short_bootstrap_node_name', undef),
   $certificates_specs  = hiera('apache_certificates_specs', {}),
   $ironic_api_network  = hiera('ironic_api_network', undef),
   $enable_internal_tls = hiera('enable_internal_tls', false),
diff --git a/manifests/profile/base/ironic_inspector.pp b/manifests/profile/base/ironic_inspector.pp
index 4e5e92f55..53ad7edb8 100644
--- a/manifests/profile/base/ironic_inspector.pp
+++ b/manifests/profile/base/ironic_inspector.pp
@@ -20,14 +20,14 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('ironic_inspector_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 
 class tripleo::profile::base::ironic_inspector (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('ironic_inspector_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
 
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index dbe6008ca..e90f6f07e 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -25,7 +25,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('keystone_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -144,7 +144,7 @@
 #
 class tripleo::profile::base::keystone (
   $admin_endpoint_network         = hiera('keystone_admin_api_network', undef),
-  $bootstrap_node                 = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                 = hiera('keystone_short_bootstrap_node_name', undef),
   $certificates_specs             = hiera('apache_certificates_specs', {}),
   $enable_internal_tls            = hiera('enable_internal_tls', false),
   $heat_admin_domain              = undef,
diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp
index 6386e6cbd..e4e947cba 100644
--- a/manifests/profile/base/manila.pp
+++ b/manifests/profile/base/manila.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('manila_api_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
@@ -71,7 +71,7 @@
 #   Defaults to hiera('manila::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::manila (
-  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node          = hiera('manila_api_short_bootstrap_node_name', undef),
   $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index 90510fee9..5988c1187 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -48,7 +48,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('manila_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -84,7 +84,7 @@ class tripleo::profile::base::manila::api (
   $backend_unity_enabled   = hiera('manila_backend_unity_enabled', false),
   $backend_vnx_enabled     = hiera('manila_backend_vnx_enabled', false),
   $backend_cephfs_enabled  = hiera('manila_backend_cephfs_enabled', false),
-  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node          = hiera('manila_api_short_bootstrap_node_name', undef),
   $certificates_specs      = hiera('apache_certificates_specs', {}),
   $manila_api_network      = hiera('manila_api_network', undef),
   $enable_internal_tls     = hiera('enable_internal_tls', false),
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index 89577b889..c64204ce8 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('mistral_engine_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -72,7 +72,7 @@
 #   Defaults to hiera('mistral::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::mistral (
-  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node          = hiera('mistral_engine_short_bootstrap_node_name', undef),
   $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index f13a44f5d..d45977c25 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -45,7 +45,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('mistral_api_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -53,7 +53,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::mistral::api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('mistral_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $mistral_api_network           = hiera('mistral_api_network', undef),
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index 95581aa20..4c98809b5 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('mistral_engine_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::mistral::engine (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('mistral_engine_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/mistral/event_engine.pp b/manifests/profile/base/mistral/event_engine.pp
index f9ea2f873..e46677fc8 100644
--- a/manifests/profile/base/mistral/event_engine.pp
+++ b/manifests/profile/base/mistral/event_engine.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('mistral_event_engine_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::mistral::event_engine (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('mistral_event_engine_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index cce96dc1f..d9b8a1b55 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('mistral_executor_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::mistral::executor (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('mistral_executor_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/neutron/ovn_northd.pp b/manifests/profile/base/neutron/ovn_northd.pp
index 721e84e59..ab4d5b8aa 100644
--- a/manifests/profile/base/neutron/ovn_northd.pp
+++ b/manifests/profile/base/neutron/ovn_northd.pp
@@ -18,7 +18,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('ovn_dbs_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -26,7 +26,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::ovn_northd (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('ovn_dbs_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $step >= 4 {
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 4c270c925..db268e22a 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('neutron_plugin_ml2_short_bootstrap_node_name')
 #
 # [*mechanism_drivers*]
 #   (Optional) The mechanism drivers to use with the Ml2 plugin
@@ -39,7 +39,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::plugins::ml2 (
-  $bootstrap_node    = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node    = hiera('neutron_plugin_ml2_short_bootstrap_node_name', undef),
   $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
   $service_names     = hiera('service_names'),
   $step              = Integer(hiera('step')),
diff --git a/manifests/profile/base/neutron/plugins/nsx.pp b/manifests/profile/base/neutron/plugins/nsx.pp
index d8a618984..976adffba 100644
--- a/manifests/profile/base/neutron/plugins/nsx.pp
+++ b/manifests/profile/base/neutron/plugins/nsx.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('neutron_plugin_nsx_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::plugins::nsx (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('neutron_plugin_nsx_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index ccfcae1a9..5e5f06a42 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -18,7 +18,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('neutron_plugin_nuage_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -26,7 +26,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::plugins::nuage (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('neutron_plugin_nuage_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index d13af6121..84e96301e 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -18,7 +18,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('contrail_neutron_plugin_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -26,7 +26,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::plugins::opencontrail (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('contrail_neutron_plugin_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index 606f00163..826c08413 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('neutron_plugin_plumgrid_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::plugins::plumgrid (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('neutron_plugin_plumgrid_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 60ef44308..ee6db7013 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('neutron_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -83,7 +83,7 @@
 #   defaults to 9696
 #
 class tripleo::profile::base::neutron::server (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('neutron_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $dvr_enabled                   = hiera('neutron::server::router_distributed', false),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index eb6856f9b..1aa647084 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('nova_api_short_bootstrap_node_name')
 #
 # [*oslomsg_rpc_proto*]
 #   Protocol driver for the oslo messaging rpc service
@@ -75,7 +75,7 @@
 #   Defaults to hiera('memcached_node_ips')
 
 class tripleo::profile::base::nova (
-  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node          = hiera('nova_api_short_bootstrap_node_name', undef),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('nova::rabbit_password'),
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index d7764a533..9c9374e45 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -18,7 +18,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('nova_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -72,7 +72,7 @@
 #   defaults to 8080
 #
 class tripleo::profile::base::nova::api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('nova_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $nova_api_network              = hiera('nova_api_network', undef),
diff --git a/manifests/profile/base/nova/ec2api.pp b/manifests/profile/base/nova/ec2api.pp
index 5a45d78bb..652743b4f 100644
--- a/manifests/profile/base/nova/ec2api.pp
+++ b/manifests/profile/base/nova/ec2api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('ec2_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -84,7 +84,7 @@
 #    Defaults to 8789
 #
 class tripleo::profile::base::nova::ec2api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('ec2_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $ec2_api_network               = hiera('ec2_api_network', undef),
diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp
index 33e40b2a5..a8cb0c6a9 100644
--- a/manifests/profile/base/nova/placement.pp
+++ b/manifests/profile/base/nova/placement.pp
@@ -18,7 +18,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('nova_placement_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -47,7 +47,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::placement (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('nova_placement_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $nova_placement_network        = hiera('nova_placement_network', undef),
diff --git a/manifests/profile/base/octavia/api.pp b/manifests/profile/base/octavia/api.pp
index 2777529c6..fb35c6b2a 100644
--- a/manifests/profile/base/octavia/api.pp
+++ b/manifests/profile/base/octavia/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('octavia_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -71,7 +71,7 @@
 #   defaults to hiera('octavia::api::service_name', undef)
 #
 class tripleo::profile::base::octavia::api (
-  $bootstrap_node      = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node      = hiera('octavia_api_short_bootstrap_node_name', undef),
   $certificates_specs  = hiera('apache_certificates_specs', {}),
   $enable_internal_tls = hiera('enable_internal_tls', false),
   $octavia_network     = hiera('octavia_api_network', undef),
diff --git a/manifests/profile/base/panko/api.pp b/manifests/profile/base/panko/api.pp
index 6de33250b..f82c7273f 100644
--- a/manifests/profile/base/panko/api.pp
+++ b/manifests/profile/base/panko/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('panko_api_short_bootstrap_node_name')
 #
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
@@ -53,7 +53,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::panko::api (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('panko_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $panko_network                 = hiera('panko_api_network', undef),
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index d46530433..55f645fb1 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('sahara_engine_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
@@ -71,7 +71,7 @@
 #   Defaults to hiera('sahara::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::sahara (
-  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node          = hiera('sahara_engine_short_bootstrap_node_name', undef),
   $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp
index 1bbbfa2fd..6d131b144 100644
--- a/manifests/profile/base/sahara/engine.pp
+++ b/manifests/profile/base/sahara/engine.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('sahara_engine_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::sahara::engine (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('sahara_engine_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 01a1241c2..cb51dc7ca 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('swift_proxy_short_bootstrap_node_name')
 #
 # [*ceilometer_enabled*]
 #   Whether the ceilometer pipeline is enabled.
@@ -100,7 +100,7 @@
 #   defaults to 8080
 #
 class tripleo::profile::base::swift::proxy (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node                = hiera('swift_proxy_short_bootstrap_node_name', undef),
   $ceilometer_enabled            = true,
   $ceilometer_messaging_driver   = hiera('messaging_notify_service_name', 'rabbit'),
   $ceilometer_messaging_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
diff --git a/manifests/profile/base/tacker.pp b/manifests/profile/base/tacker.pp
index 5d3a54f84..f6ac16b8e 100644
--- a/manifests/profile/base/tacker.pp
+++ b/manifests/profile/base/tacker.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('tacker_short_bootstrap_node_name')
 #
 # [*oslomsg_rpc_proto*]
 #   Protocol driver for the oslo messaging rpc service
@@ -51,7 +51,7 @@
 #   Defaults to hiera('step')
 
 class tripleo::profile::base::tacker (
-  $bootstrap_node       = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node       = hiera('tacker_short_bootstrap_node_name', undef),
   $oslomsg_rpc_proto    = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password = hiera('tacker::rabbit_password'),
diff --git a/manifests/profile/base/trove/api.pp b/manifests/profile/base/trove/api.pp
index aac592360..660b261b1 100644
--- a/manifests/profile/base/trove/api.pp
+++ b/manifests/profile/base/trove/api.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('trove_api_short_bootstrap_node_name')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::trove::api (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = hiera('trove_api_short_bootstrap_node_name', undef),
   $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp
index cf33c30be..30720abc7 100644
--- a/manifests/profile/base/zaqar.pp
+++ b/manifests/profile/base/zaqar.pp
@@ -20,7 +20,7 @@
 #
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('zaqar_api_short_bootstrap_node_name')
 #
 # [*management_store*]
 #   (Optional) The management store for Zaqar.
@@ -65,7 +65,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::zaqar (
-  $bootstrap_node       = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node       = hiera('zaqar_api_short_bootstrap_node_name', undef),
   $management_store     = 'mongodb',
   $messaging_store      = 'mongodb',
   $certificates_specs   = hiera('apache_certificates_specs', {}),
diff --git a/manifests/profile/pacemaker/neutron/lbaas.pp b/manifests/profile/pacemaker/neutron/lbaas.pp
index 9e86dfe8b..1b7ac851e 100644
--- a/manifests/profile/pacemaker/neutron/lbaas.pp
+++ b/manifests/profile/pacemaker/neutron/lbaas.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('neutron_lbaas_api_short_bootstrap_node_name')
 #
 class tripleo::profile::pacemaker::neutron::lbaas (
   $step             = Integer(hiera('step')),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('neutron_lbaas_api_short_bootstrap_node_name'),
 ) {
 
   include ::neutron::params
diff --git a/releasenotes/notes/remove_bootstrap_nodeid-c5109a575c538bda.yaml b/releasenotes/notes/remove_bootstrap_nodeid-c5109a575c538bda.yaml
new file mode 100644
index 000000000..47ba3254c
--- /dev/null
+++ b/releasenotes/notes/remove_bootstrap_nodeid-c5109a575c538bda.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    All manifests no longer use the bootstrap_nodeid hiera key, since this
+    was generated per role and can result in multiple bootstrap nodes when
+    a service on more than one role. The SERVICE_short_bootstrap_node_name
+    key is used instead, which is automatically generated in tripleo-heat-templates
+    based on the service_name key of the service template role_data.
diff --git a/spec/classes/tripleo_profile_base_database_redis_spec.rb b/spec/classes/tripleo_profile_base_database_redis_spec.rb
index 8f94cc901..4624d2867 100644
--- a/spec/classes/tripleo_profile_base_database_redis_spec.rb
+++ b/spec/classes/tripleo_profile_base_database_redis_spec.rb
@@ -22,7 +22,7 @@ describe 'tripleo::profile::base::database::redis' do
     context 'with step less than 2' do
       let(:params) { {
         :step             => 1,
-        :bootstrap_nodeid => 'node.example.com',
+        :redis_short_bootstrap_node_name => 'node.example.com',
         :redis_node_ips   => []
       } }
 
@@ -37,7 +37,7 @@ describe 'tripleo::profile::base::database::redis' do
     context 'with step 2 on bootstrap node' do
       let(:params) { {
         :step             => 2,
-        :bootstrap_nodeid => 'node.example.com',
+        :redis_short_bootstrap_node_name => 'node.example.com',
         :redis_node_ips   => ['10.0.0.1']
       } }
 
@@ -52,7 +52,7 @@ describe 'tripleo::profile::base::database::redis' do
     context 'with step 2 on bootstrap node with capital letters' do
       let(:params) { {
         :step             => 2,
-        :bootstrap_nodeid => 'NODE.example.com',
+        :redis_short_bootstrap_node_name => 'NODE.example.com',
         :redis_node_ips   => ['10.0.0.1']
       } }
 
@@ -65,13 +65,13 @@ describe 'tripleo::profile::base::database::redis' do
     context 'with step 2 not on bootstrap node' do
       let(:params) { {
         :step             => 2,
-        :bootstrap_nodeid => 'othernode.example.com',
+        :redis_short_bootstrap_node_name => 'othernode.example.com',
         :redis_node_ips   => ['10.0.0.1']
       } }
 
       it 'should configure redis' do
         is_expected.to contain_class('tripleo::profile::base::database::redis')
-        is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379")
+        is_expected.to contain_class('redis').with(:slaveof => "#{params[:redis_short_bootstrap_node_name]} 6379")
         is_expected.to_not contain_class('redis::sentinel')
         is_expected.to_not contain_class('tripleo::redis_notification')
       end
@@ -80,13 +80,13 @@ describe 'tripleo::profile::base::database::redis' do
     context 'with step 2 with multiple nodes' do
       let(:params) { {
         :step             => 2,
-        :bootstrap_nodeid => 'othernode.example.com',
+        :redis_short_bootstrap_node_name => 'othernode.example.com',
         :redis_node_ips   => ['10.0.0.1', '10.0.0.2']
       } }
 
       it 'should configure redis' do
         is_expected.to contain_class('tripleo::profile::base::database::redis')
-        is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379")
+        is_expected.to contain_class('redis').with(:slaveof => "#{params[:redis_short_bootstrap_node_name]} 6379")
         is_expected.to contain_class('redis::sentinel')
         is_expected.to contain_class('tripleo::redis_notification')
       end