diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index d8b67ec..e5c8240 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -12,6 +12,7 @@
 
     atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}/bitbucket/shared"
     atl_nfs_target: "{{ atl_shared_mountpoint }}/bitbucket/shared"
+    atl_nfs_version: "3"
 
     atl_startup_systemd_params:
       - "UMask=0027"
diff --git a/roles/nfs_mount/defaults/main.yml b/roles/nfs_mount/defaults/main.yml
index 6464ddd..ce2f7a4 100644
--- a/roles/nfs_mount/defaults/main.yml
+++ b/roles/nfs_mount/defaults/main.yml
@@ -2,3 +2,4 @@
 
 atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}"
 atl_nfs_target: "{{ atl_shared_mountpoint }}"
+atl_nfs_version: "4.1"
diff --git a/roles/nfs_mount/tasks/main.yml b/roles/nfs_mount/tasks/main.yml
index 9e170e4..dfe6a27 100644
--- a/roles/nfs_mount/tasks/main.yml
+++ b/roles/nfs_mount/tasks/main.yml
@@ -13,5 +13,9 @@
     src: "{{ atl_fileserver_host }}:{{ atl_nfs_target }}"
     path: "{{ atl_nfs_mountpoint }}"
     fstype: nfs
-    opts: "rw,nfsvers=4.1,lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev"
+    opts: "rw,nfsvers={{ atl_nfs_version }},lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev"
     state: mounted
+  register: mount_result
+  until: not mount_result.failed
+  retries: 60
+  delay: 5