diff --git a/roles/dns/entries/defaults/main.yml b/roles/dns/entries/defaults/main.yml
new file mode 100644
index 0000000..5ee92bb
--- /dev/null
+++ b/roles/dns/entries/defaults/main.yml
@@ -0,0 +1,12 @@
+---
+
+# domain (of service running, can be replaced by dns_zone_name and entries_name)
+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: "{{ domain }}" # Name for zone part file
+
+domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ dns_zone_domain }}" # SYNC role dns/master
+domain_zone_file: "{{ domain_environment_directory }}/{{ entries_name }}.db"
+
+# entries (in bind zone file format)
diff --git a/roles/dns/entries/meta/main.yml b/roles/dns/entries/meta/main.yml
new file mode 100644
index 0000000..cf5427b
--- /dev/null
+++ b/roles/dns/entries/meta/main.yml
@@ -0,0 +1,3 @@
+---
+
+allow_duplicates: yes
diff --git a/roles/dns/server_entries/tasks/main.yml b/roles/dns/entries/tasks/main.yml
similarity index 99%
rename from roles/dns/server_entries/tasks/main.yml
rename to roles/dns/entries/tasks/main.yml
index 1fafe9a..d116459 100644
--- a/roles/dns/server_entries/tasks/main.yml
+++ b/roles/dns/entries/tasks/main.yml
@@ -23,4 +23,3 @@
     state: reloaded
   when: result_rebuild_zone.changed
   delegate_to: "{{ dns_system_domain }}"
-
diff --git a/roles/dns/master/defaults/main.yml b/roles/dns/master/defaults/main.yml
index a322e3a..af729b4 100644
--- a/roles/dns/master/defaults/main.yml
+++ b/roles/dns/master/defaults/main.yml
@@ -6,7 +6,7 @@ domain_directory: "{{ zones_directory }}/{{ domain }}"
 configuration_file: "{{ domain_directory }}/zone.conf"
 database_file: "{{ domain_directory }}/{{ zones_environment_database_name }}"
 keys_directory: "{{ domain_directory }}/keys"
-domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ domain }}" # SYNC role dns/server_entries
+domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ domain }}" # SYNC role dns/entries
 
 dns_list_file: "{{ global_dns_list_directory }}/{{ domain }}"
 
diff --git a/roles/dns/server_entries/defaults/main.yml b/roles/dns/server_entries/defaults/main.yml
index 08a9f7a..76437f1 100644
--- a/roles/dns/server_entries/defaults/main.yml
+++ b/roles/dns/server_entries/defaults/main.yml
@@ -1,13 +1,8 @@
 ---
 
 # 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
 service_system_domain: "{{ inventory_hostname }}" # domain of server running the service
 
-domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ dns_zone_domain }}" # SYNC role dns/master
-domain_zone_file: "{{ domain_environment_directory }}/{{ domain }}.db"
-
 entries: |
   {{ ip_entries }}
   {{ custom_entries }}
diff --git a/roles/dns/server_entries/meta/main.yml b/roles/dns/server_entries/meta/main.yml
index cf5427b..b1c4ca4 100644
--- a/roles/dns/server_entries/meta/main.yml
+++ b/roles/dns/server_entries/meta/main.yml
@@ -1,3 +1,8 @@
 ---
 
 allow_duplicates: yes
+
+dependencies:
+  - role: dns/entries
+    # domain
+    # entries