diff --git a/roles/dns/entries/defaults/main.yml b/roles/dns/entries/defaults/main.yml
index 97b2e4e..78e9e64 100644
--- a/roles/dns/entries/defaults/main.yml
+++ b/roles/dns/entries/defaults/main.yml
@@ -1,10 +1,11 @@
 ---
 
-# domain (of service running, can be replaced by dns_zone_domain and entries_name)
+# domain (of service running)
 dns_zone_domain: "{{ lookup('pipe', global_public_key_directory|quote + '/dns_zone.py ' + domain|quote) }}" # domain of dns zone
 dns_system_domain: "{{ lookup('file', global_dns_list_directory + '/' + dns_zone_domain) }}" # domain of dns authority server
 
-entries_name: "server~{{ domain }}" # Name for zone part file
+entries_name_prefix: "server"
+entries_name: "{{ entries_name_prefix }}:{{ effective_domain }}" # Name for zone part file
 entries_file: "{{ global_dns_changes_directory }}/{{ entries_name }}~update"
 
 ttl_default: "{{ global_dns_ttl }}" # TTL for all entries where none was given
diff --git a/roles/dns/master/tasks/main.yml b/roles/dns/master/tasks/main.yml
index 6b8bbbd..167aba7 100644
--- a/roles/dns/master/tasks/main.yml
+++ b/roles/dns/master/tasks/main.yml
@@ -70,6 +70,6 @@
   import_role:
     name: dns/entries
   vars:
-    entries_name: "initial:{{ domain }}"
+    entries_name_prefix: initial
     # domain
     # entries