diff --git a/roles/aws_common/tasks/amazon.yml b/roles/aws_common/tasks/amazon.yml
index a6592bf..f19485a 100644
--- a/roles/aws_common/tasks/amazon.yml
+++ b/roles/aws_common/tasks/amazon.yml
@@ -6,6 +6,7 @@
       - ec2-utils
       - amazon-ssm-agent
       - amazon-efs-utils
+    lock_timeout: 30
 
 - name: Install CloudWatch Agent
   yum:
diff --git a/roles/linux_common/tasks/amazon.yml b/roles/linux_common/tasks/amazon.yml
index 3be04db..ad70b98 100644
--- a/roles/linux_common/tasks/amazon.yml
+++ b/roles/linux_common/tasks/amazon.yml
@@ -6,3 +6,4 @@
       - shadow-utils
       - libxml2
       - git-{{ git_version }}
+    lock_timeout: 30
diff --git a/roles/nfs_server/tasks/amazon.yml b/roles/nfs_server/tasks/amazon.yml
index ad2adee..67b71d0 100644
--- a/roles/nfs_server/tasks/amazon.yml
+++ b/roles/nfs_server/tasks/amazon.yml
@@ -4,3 +4,4 @@
   yum:
     name:
       - nfs-utils
+    lock_timeout: 30
diff --git a/roles/nfs_server/tasks/ubuntu.yml b/roles/nfs_server/tasks/ubuntu.yml
index 5bb5dcb..becb1d8 100644
--- a/roles/nfs_server/tasks/ubuntu.yml
+++ b/roles/nfs_server/tasks/ubuntu.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Install Ubuntu-specific NFS packages
-  yum:
+  apt:
     name:
       - nfs-kernel-server
       - libnfs-utils
diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
index c02f864..0175922 100644
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -4,9 +4,11 @@
   yum:
     name:
       - java-{{ java_version }}-openjdk-devel
+    lock_timeout: 30
   when: atl_use_system_jdk
 
 - name: Install other base packages on Amazon Linux
   yum:
     name:
       - dejavu-fonts-common  # Required by the installer
+    lock_timeout: 30