diff --git a/aws_bitbucket_nfs_node.yml b/aws_bitbucket_nfs_node.yml
index 189b1ba..4bceef7 100644
--- a/aws_bitbucket_nfs_node.yml
+++ b/aws_bitbucket_nfs_node.yml
@@ -11,4 +11,3 @@
   roles:
     - role: linux_common
     - role: aws_common
-    - role: aws_efs_config
diff --git a/roles/linux_common/tasks/amazon.yml b/roles/linux_common/tasks/amazon.yml
index b07cafb..3be04db 100644
--- a/roles/linux_common/tasks/amazon.yml
+++ b/roles/linux_common/tasks/amazon.yml
@@ -5,3 +5,4 @@
     name:
       - shadow-utils
       - libxml2
+      - git-{{ git_version }}
diff --git a/roles/linux_common/tasks/ubuntu.yml b/roles/linux_common/tasks/ubuntu.yml
index 08e7d21..b5c542c 100644
--- a/roles/linux_common/tasks/ubuntu.yml
+++ b/roles/linux_common/tasks/ubuntu.yml
@@ -5,3 +5,4 @@
     name:
       - python3-psycopg2
       - libxml2-utils
+      - git
diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
index afcbadc..7e9abb1 100644
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -9,8 +9,7 @@
 - name: Install other base packages on Amazon Linux
   yum:
     name:
-      - git-{{ git_version }}
-      - dejavu-fonts-common
+      - dejavu-fonts-common  # Required by the installer
 
 # Amazon Linux 2 supplies extra packages via a special command.
 - name: Enable Postgresql from 'extras'
diff --git a/roles/product_common/tasks/ubuntu.yml b/roles/product_common/tasks/ubuntu.yml
index 9fb1bf6..7b28b70 100644
--- a/roles/product_common/tasks/ubuntu.yml
+++ b/roles/product_common/tasks/ubuntu.yml
@@ -12,5 +12,4 @@
   package:
     name:
       - postgresql-client
-      - fonts-dejavu-core
-      - git
+      - fonts-dejavu-core  # Required by installer