diff --git a/roles/aws_common/tasks/amazon.yml b/roles/aws_common/tasks/amazon.yml
index e125696..3d365e1 100644
--- a/roles/aws_common/tasks/amazon.yml
+++ b/roles/aws_common/tasks/amazon.yml
@@ -5,7 +5,3 @@
     name:
       - amazon-ssm-agent
       - amazon-efs-utils
-
-# Amazon Linux 2 supplies extra packages via a special command.
-- name: Enable Postgresql from 'extras'
-  command: amazon-linux-extras enable -y "postgresql{{ postgres_version }}"
diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
index 747043c..f72fb53 100644
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -5,4 +5,9 @@
     name:
       - java-{{ java_version }}-openjdk-devel
       - git-{{ git_version }}
-      - postgresql
+
+# Amazon Linux 2 supplies extra packages via a special command.
+- name: Enable Postgresql from 'extras'
+  command: amazon-linux-extras install -y "postgresql{{ postgres_version }}"
+  args:
+    creates: /usr/bin/psql