diff --git a/roles/nfs-client/tasks/mountFileSystem.yml b/roles/nfs-client/tasks/mountFileSystem.yml
index da39a8eb2842761fe07d79a5691e7d44aeb0c7b5..6666e762bdfa88952f9bd16caf2e5c69a37ef048 100644
--- a/roles/nfs-client/tasks/mountFileSystem.yml
+++ b/roles/nfs-client/tasks/mountFileSystem.yml
@@ -6,7 +6,7 @@
   run_once: true
   delegate_to: "{{ nfs_server }}"
 - 
-  mount: "name={{ item.name }} src={{ nfsServer['ansible_facts']['ansible_tun0']['ipv4']['address'] }}:{{ item.src }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted"
+  mount: "name={{ item.name }} src={{ nfsServer['ansible_facts']['ansible_'+item.interface]['ipv4']['address'] }}:{{ item.src }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted"
   name: "Mounting NFS mounts"
   with_items: exportList 
   notify: "restart authentication"
diff --git a/roles/nfs-client/vars/main.yml b/roles/nfs-client/vars/main.yml
index 6d9a86f91a6b348ba960d11a2ccce99d29c219df..fd7f0fcce0d2ef2b15b48ffdde2ea956e1732a82 100644
--- a/roles/nfs-client/vars/main.yml
+++ b/roles/nfs-client/vars/main.yml
@@ -1,4 +1,4 @@
 ---
 # This is a list of exports, individual entry for each mount.
 exportList:
- - { name : '/mnt/test-nfs', src : '/mnt',fstype : 'nfs', opts : 'vers=3,noatime,rsize=16384,wsize=16384,hard,intr,tcp,nolock' }
+ - { name : '/mnt/test-nfs', src : '/mnt',fstype : 'nfs', opts : 'vers=3,noatime,rsize=16384,wsize=16384,hard,intr,tcp,nolock' , interface : 'tun0' }
diff --git a/roles/nfs-common/tasks/main.yml b/roles/nfs-common/tasks/main.yml
index 5f1757d5f6b2724de61540f7c82b23921ae46d18..559decd124f9d12dcd73ccd74bfd5400ebe5f7ae 100644
--- a/roles/nfs-common/tasks/main.yml
+++ b/roles/nfs-common/tasks/main.yml
@@ -2,5 +2,5 @@
 - include: yumPackages.yml
 
 - name: setup idmap.conf
-  template: src=idmap.conf.j2 dest=/etc/idmap.conf
+  template: src=idmapd.conf.j2 dest=/etc/idmapd.conf
   sudo: true