diff --git a/ansible/group_vars/all/all b/ansible/group_vars/all/all
index 9e2a88b..e86e311 100644
--- a/ansible/group_vars/all/all
+++ b/ansible/group_vars/all/all
@@ -4,4 +4,3 @@ 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: "{{ hostvars[groups['NAS'][0]]['ansible_facts']['default_ipv4']['address']|default('192.168.1.10')}}"
diff --git a/ansible/group_vars/production b/ansible/group_vars/production
index a63d4ee..45a802c 100644
--- a/ansible/group_vars/production
+++ b/ansible/group_vars/production
@@ -10,3 +10,4 @@ vault_unseal_keys_dir_output: "~/vaultUnseal/production"
 env_default_nfs_path: "/volume2"
 env_media_nfs_path: "/volume1"
 env_automount: true
+nas_ip: "192.168.1.10"
diff --git a/ansible/group_vars/staging b/ansible/group_vars/staging
index f3fa539..fc80a95 100644
--- a/ansible/group_vars/staging
+++ b/ansible/group_vars/staging
@@ -14,6 +14,9 @@ hosts_entries:
     - ip: "{{ hostvars['nas-dev']['ansible_default_ipv4']['address'] }}"
       name: diskstation.ducamps.eu
 
-env_default_nfs_path: "/var/local/volume1"
+env_default_nfs_path: ""
 env_media_nfs_path: "{{ env_default_nfs_path }}"
 env_automount: false
+nas_ip: "nfs.service.consul"
+
+