diff --git a/roles/fedmsg/datanommer/tasks/main.yml b/roles/fedmsg/datanommer/tasks/main.yml
index c0feb9ee1e..7273b5755d 100644
--- a/roles/fedmsg/datanommer/tasks/main.yml
+++ b/roles/fedmsg/datanommer/tasks/main.yml
@@ -2,13 +2,14 @@
 # correctly is actually included as part of the fedmsg/base role.
 
 - name: install datanommer packages
-  package: name="{{ item }}" state=present
-  with_items:
-  - python-datanommer-consumer
-  - python-datanommer-models
-  - python-psycopg2
-  - datanommer-commands
-  tags:
+  package:
+    state: present
+    name:
+    - python-datanommer-consumer
+    - python-datanommer-models
+    - python-psycopg2
+    - datanommer-commands
+    tags:
   - packages
   - datanommer
 
diff --git a/roles/fedmsg/gateway/slave/tasks/main.yml b/roles/fedmsg/gateway/slave/tasks/main.yml
index 2b649714b6..933f26c3af 100644
--- a/roles/fedmsg/gateway/slave/tasks/main.yml
+++ b/roles/fedmsg/gateway/slave/tasks/main.yml
@@ -2,10 +2,11 @@
 # Tasks to set up fedmsg-gateway-slave
 
 - name: install needed packages
-  package: name={{ item }} state=present
-  with_items:
-  - fedmsg-gateway
-  - stunnel
+  package:
+    state: present
+    name:
+    - fedmsg-gateway
+    - stunnel
   tags:
   - packages
   - fedmsg/gateway
diff --git a/roles/fedmsg/irc/tasks/main.yml b/roles/fedmsg/irc/tasks/main.yml
index 5d2e7d23a0..926f9eec47 100644
--- a/roles/fedmsg/irc/tasks/main.yml
+++ b/roles/fedmsg/irc/tasks/main.yml
@@ -1,9 +1,10 @@
 
 - name: install package for fedmsg-irc
-  package: name={{ item }} state=present
-  tags:
-  - packages
-  - fedmsg/irc
+  package:
+    state: present
+    name:
+    - packages
+    - fedmsg/irc
   with_items:
   - fedmsg-irc
   - python2-fedmsg-meta-fedora-infrastructure