diff --git a/ansible/group_vars/all/all b/ansible/group_vars/all/all
index 77c83f0..9e2a88b 100644
--- a/ansible/group_vars/all/all
+++ b/ansible/group_vars/all/all
@@ -4,4 +4,4 @@ system_arch_local_mirror: "https://arch.{{domain.name}}/repo/archlinux_$arch"
 system_sudoers_group: "serverAdmin"
 system_ipV6_disable: True
 system_ip_unprivileged_port_start: 0
-nas_ip: "192.168.1.10"
+nas_ip: "{{ hostvars[groups['NAS'][0]]['ansible_facts']['default_ipv4']['address']|default('192.168.1.10')}}"
diff --git a/ansible/group_vars/staging b/ansible/group_vars/staging
index 44d961d..8b169c5 100644
--- a/ansible/group_vars/staging
+++ b/ansible/group_vars/staging
@@ -6,7 +6,6 @@ consul_bootstrap_expect: 2
 consul_domain: "consul"
 nomad_bootstrap_expect: 2
 vault_unseal_keys_dir_output: "~/vaultUnseal/staging"
-nfs_domain_name: "{{ domain.name}}"
 hosts_entries:
     - ip: "{{ hostvars['nas-dev']['ansible_default_ipv4']['address'] }}"
       name: diskstation.ducamps.eu