diff --git a/templates/openstackephemeralheat/bin/heat.conf b/templates/openstackephemeralheat/bin/heat.conf
index 4adcf70d..d8a183ab 100644
--- a/templates/openstackephemeralheat/bin/heat.conf
+++ b/templates/openstackephemeralheat/bin/heat.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 debug=True
 verbose=True
-transport_url=rabbit://guest:guest@{{.RabbitMQHost}}:5672/?ssl=0
+transport_url=rabbit://guest:guest@{{.RabbitMQHost}}.cluster.local:5672/?ssl=0
 api_workers=3
 rpc_workers=3
 keystone_backend=heat.engine.clients.os.keystone.fake_keystoneclient.FakeKeystoneClient
@@ -14,7 +14,7 @@ convergence_engine=True
 num_engine_workers=4
 rpc_response_timeout=600
 [database]
-connection=mysql+pymysql://heat:{{.MariaDBPassword}}@{{.MariaDBHost}}/heat
+connection=mysql+pymysql://heat:{{.MariaDBPassword}}@{{.MariaDBHost}}.cluster.local/heat
 max_retries=-1
 db_max_retries=-1
 [paste_deploy]