diff --git a/leap-upgrades/upgrade-utilities-mitaka/playbooks/old-hostname-compatibility-mitaka.yml b/leap-upgrades/upgrade-utilities-mitaka/playbooks/old-hostname-compatibility-mitaka.yml
index 1e273b50..ffe9c24d 100644
--- a/leap-upgrades/upgrade-utilities-mitaka/playbooks/old-hostname-compatibility-mitaka.yml
+++ b/leap-upgrades/upgrade-utilities-mitaka/playbooks/old-hostname-compatibility-mitaka.yml
@@ -51,7 +51,7 @@
         - result2 | skipped
   vars:
     rfc_1034_1035_name: "{{ inventory_hostname | replace('_', '-') }}"
-    domain_name: "{{ openstack_domain|default('openstack.local') }}"
+    domain_name: "{{ openstack_domain|default('.openstack.local') }}"
 
 - name: Cleanup heat services through the database
   hosts: galera_all[0]
diff --git a/leap-upgrades/upgrade-utilities-newton/playbooks/old-hostname-compatibility-newton.yml b/leap-upgrades/upgrade-utilities-newton/playbooks/old-hostname-compatibility-newton.yml
index 04745596..50fc0d2d 100644
--- a/leap-upgrades/upgrade-utilities-newton/playbooks/old-hostname-compatibility-newton.yml
+++ b/leap-upgrades/upgrade-utilities-newton/playbooks/old-hostname-compatibility-newton.yml
@@ -51,4 +51,4 @@
         - result2 | skipped
   vars:
     rfc_1034_1035_name: "{{ inventory_hostname | replace('_', '-') }}"
-    domain_name: "{{ openstack_domain|default('openstack.local') }}"
+    domain_name: "{{ openstack_domain|default('.openstack.local') }}"