diff --git a/roles/dns/entries/defaults/main.yml b/roles/dns/entries/defaults/main.yml
index 5ee92bb..a5d2455 100644
--- a/roles/dns/entries/defaults/main.yml
+++ b/roles/dns/entries/defaults/main.yml
@@ -6,7 +6,6 @@ dns_system_domain: "{{ lookup('file', global_dns_list_directory + '/' + dns_zone
 
 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/vars/main.yml b/roles/dns/entries/vars/main.yml
new file mode 100644
index 0000000..c0338c2
--- /dev/null
+++ b/roles/dns/entries/vars/main.yml
@@ -0,0 +1,3 @@
+---
+
+domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ dns_zone_domain }}" # Given by dns/master
diff --git a/roles/dns/master/defaults/main.yml b/roles/dns/master/defaults/main.yml
index af729b4..256cd70 100644
--- a/roles/dns/master/defaults/main.yml
+++ b/roles/dns/master/defaults/main.yml
@@ -6,7 +6,6 @@ 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/entries
 
 dns_list_file: "{{ global_dns_list_directory }}/{{ domain }}"
 
diff --git a/roles/dns/master/vars/main.yml b/roles/dns/master/vars/main.yml
new file mode 100644
index 0000000..5c10c74
--- /dev/null
+++ b/roles/dns/master/vars/main.yml
@@ -0,0 +1,3 @@
+---
+
+domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ domain }}" # Fixed for usage in other roles