diff --git a/packstack/puppet/templates/heat_rabbitmq.pp b/packstack/puppet/templates/heat_rabbitmq.pp
index 2e5e3dbe3..73b4089d2 100644
--- a/packstack/puppet/templates/heat_rabbitmq.pp
+++ b/packstack/puppet/templates/heat_rabbitmq.pp
@@ -1,11 +1,11 @@
 $heat_rabbitmq_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
 $heat_rabbitmq_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
 
-$kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE', undef)
-$kombu_ssl_keyfile = hiera('CONFIG_HEAT_SSL_KEY', undef)
-$kombu_ssl_certfile = hiera('CONFIG_HEAT_SSL_CERT', undef)
+$kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE', $::os_service_default)
+$kombu_ssl_keyfile = hiera('CONFIG_HEAT_SSL_KEY', $::os_service_default)
+$kombu_ssl_certfile = hiera('CONFIG_HEAT_SSL_CERT', $::os_service_default)
 
-if $kombu_ssl_keyfile {
+if ! is_service_default($kombu_ssl_keyfile) {
   $files_to_set_owner = [ $kombu_ssl_keyfile, $kombu_ssl_certfile ]
   file { $files_to_set_owner:
     owner   => 'heat',