diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index c796841e55..7db600518a 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -3,26 +3,28 @@
 # Setup postgresql server.
 #
 - name: install postgresql server packages (yum)
-  package: name={{ item }}  state=present
-  with_items:
-  - postgresql-server
-  - postgresql-contrib
-  - postgresql-plpython
-  - python-psycopg2
-  - pxz
+  package:
+    state: present
+    name:
+    - postgresql-server
+    - postgresql-contrib
+    - postgresql-plpython
+    - python-psycopg2
+    - pxz
   when: ansible_distribution_major_version|int < 22
   tags:
   - packages
   - postgresql
 
 - name: install postgresql server packages (dnf)
-  dnf: name={{ item }}  state=present
-  with_items:
-  - postgresql-server
-  - postgresql-contrib
-  - postgresql-plpython
-  - python-psycopg2
-  - pxz
+  package:
+    state: present
+    name:
+    - postgresql-server
+    - postgresql-contrib
+    - postgresql-plpython
+    - python-psycopg2
+    - pxz
   when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
   tags:
   - packages