diff --git a/roles/anitya/frontend/tasks/main.yml b/roles/anitya/frontend/tasks/main.yml
index f7da268895..77fb755d25 100644
--- a/roles/anitya/frontend/tasks/main.yml
+++ b/roles/anitya/frontend/tasks/main.yml
@@ -35,7 +35,7 @@
   - restart apache
 
 - name: create the folder where we store the ssl cert if not already there
-  action: file state=directory
+  file: state=directory
                path=/etc/pki/tls/certs/
                owner=root group=root mode=0755
 
@@ -65,7 +65,7 @@
   - restart apache
 
 - name: set sebooleans so anitya can talk to the db
-  action: seboolean name={{ item }}
+  seboolean: name={{ item }}
                     state=true
                     persistent=true
   with_items:
diff --git a/roles/ask/tasks/main.yml b/roles/ask/tasks/main.yml
index 26440061d4..0911c17b5b 100644
--- a/roles/ask/tasks/main.yml
+++ b/roles/ask/tasks/main.yml
@@ -30,7 +30,7 @@
   - python-openid
 
 - name: set sebooleans so ask can talk to the db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
   tags:
@@ -38,7 +38,7 @@
   - selinux
 
 - name: set sebooleans so ask can use the gluster mount
-  action: seboolean name=httpd_use_fusefs
+  seboolean: name=httpd_use_fusefs
                     state=true
                     persistent=true
   tags:
@@ -46,7 +46,7 @@
   - selinux
 
 - name: set sebooleans so ask can talk to the memcache
-  action: seboolean name=httpd_can_network_memcache
+  seboolean: name=httpd_can_network_memcache
                     state=true
                     persistent=true
   tags:
@@ -54,7 +54,7 @@
   - selinux
 
 - name: set sebooleans so ask can talk to fedmsg
-  action: seboolean name=allow_httpd_sys_script_anon_write
+  seboolean: name=allow_httpd_sys_script_anon_write
                     state=true
                     persistent=true
   tags:
@@ -62,7 +62,7 @@
   - selinux
 
 - name: set sebooleans so ask can talk to fedmsg
-  action: seboolean name=allow_ypbind
+  seboolean: name=allow_ypbind
                     state=true
                     persistent=true
   tags:
diff --git a/roles/cloud_compute/tasks/main.yml b/roles/cloud_compute/tasks/main.yml
index c74b26f23d..2313c59539 100644
--- a/roles/cloud_compute/tasks/main.yml
+++ b/roles/cloud_compute/tasks/main.yml
@@ -52,7 +52,7 @@
 
 # http://docs.openstack.org/icehouse/install-guide/install/yum/content/nova-compute.html
 - name: install the Compute packages necessary for the controller node.
-  action: yum state=present pkg={{ item }}
+  yum: state=present pkg={{ item }}
   with_items:
   - openstack-nova-compute
   - python-novaclient
@@ -157,7 +157,7 @@
 - sysctl: name=net.ipv4.conf.default.rp_filter value=0 state=present sysctl_set=yes reload=yes
 
 - name: install the Networking components
-  action: yum state=present pkg={{ item }}
+  yum: state=present pkg={{ item }}
   with_items:
   - openstack-neutron-ml2
   - openstack-neutron-openvswitch
diff --git a/roles/copr/backend/files/provision/builderpb.yml b/roles/copr/backend/files/provision/builderpb.yml
index 49f1af569f..7c2ad218d2 100644
--- a/roles/copr/backend/files/provision/builderpb.yml
+++ b/roles/copr/backend/files/provision/builderpb.yml
@@ -42,10 +42,10 @@
   
   tasks:
   - name: edit hostname to be instance name
-    action: shell hostname  `curl -s http://169.254.169.254/2009-04-04/meta-data/instance-id`
+    shell: hostname  `curl -s http://169.254.169.254/2009-04-04/meta-data/instance-id`
 
   - name: install pkgs
-    action: yum state=present pkg={{ item }}
+    yum: state=present pkg={{ item }}
     with_items:
     - rsync
     - openssh-clients
@@ -53,12 +53,12 @@
     - libsemanage-python
 
   - name: add repos
-    action: copy src={{ files }}/{{ item }} dest=/etc/yum.repos.d/{{ item }}
+    copy: src={{ files }}/{{ item }} dest=/etc/yum.repos.d/{{ item }}
     with_items:
     - epel6.repo
 
   - name: install additional pkgs
-    action: yum state=present pkg={{ item }}
+    yum: state=present pkg={{ item }}
     with_items:
     - mock
     - createrepo
@@ -66,7 +66,7 @@
     - pyliblzma
 
   - name: make sure newest rpm
-    action: yum name={{ item }} state=latest
+    yum: name={{ item }} state=latest
     with_items:
     - rpm
     - glib2
@@ -75,16 +75,16 @@
   #- yum: name=mock  enablerepo=epel-testing state=latest
 
   - name: mockbuilder user   
-    action: user name=mockbuilder groups=mock
+    user: name=mockbuilder groups=mock
 
   - name: mockbuilder .ssh
-    action: file state=directory path=/home/mockbuilder/.ssh mode=0700 owner=mockbuilder group=mockbuilder
+    file: state=directory path=/home/mockbuilder/.ssh mode=0700 owner=mockbuilder group=mockbuilder
 
   - name: mockbuilder authorized_keys
-    action: authorized_key user=mockbuilder key='{{ lookup('file', '/home/copr/provision/files/buildsys.pub') }}'
+    authorized_key: user=mockbuilder key='{{ lookup('file', '/home/copr/provision/files/buildsys.pub') }}'
 
   - name: put updated mock configs into /etc/mock
-    action: template src={{ files }}/mock/{{ item }} dest=/etc/mock
+    template: src={{ files }}/mock/{{ item }} dest=/etc/mock
     with_items:
     - site-defaults.cfg
 
diff --git a/roles/copr/backend/handlers/main.yml b/roles/copr/backend/handlers/main.yml
index 876763db19..2994015d18 100644
--- a/roles/copr/backend/handlers/main.yml
+++ b/roles/copr/backend/handlers/main.yml
@@ -1,5 +1,5 @@
 - name: chmod_key
-  action: file path=/etc/lighttpd/copr-be.fedoraproject.org.pem owner=root group=root mode=0600
+  file: path=/etc/lighttpd/copr-be.fedoraproject.org.pem owner=root group=root mode=0600
 
 - name: restart copr-backend
   service: name=copr-backend state=restarted
diff --git a/roles/copr/frontend/tasks/psql_setup.yml b/roles/copr/frontend/tasks/psql_setup.yml
index 0c4c8e975f..3b5b3f613c 100644
--- a/roles/copr/frontend/tasks/psql_setup.yml
+++ b/roles/copr/frontend/tasks/psql_setup.yml
@@ -1,5 +1,5 @@
 - name: install postresql
-  action: yum state=present pkg={{ item }}
+  yum: state=present pkg={{ item }}
   with_items:
   - "postgresql-server"
   - "postgresql-contrib"
diff --git a/roles/copr/keygen/handlers/main.yml b/roles/copr/keygen/handlers/main.yml
index b24e00aa2d..e7181ad594 100644
--- a/roles/copr/keygen/handlers/main.yml
+++ b/roles/copr/keygen/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: restart haveged
-  action: service name=haveged state=restarted
+  service: name=haveged state=restarted
 
 - name: restart obs-signd
-  action: service name=signd state=restarted
+  service: name=signd state=restarted
diff --git a/roles/dopr/tasks/psql_setup.yml b/roles/dopr/tasks/psql_setup.yml
index 026076102c..9406453c42 100644
--- a/roles/dopr/tasks/psql_setup.yml
+++ b/roles/dopr/tasks/psql_setup.yml
@@ -1,5 +1,5 @@
 - name: install postresql
-  action: yum state=present pkg={{ item }}
+  yum: state=present pkg={{ item }}
   with_items:
   - "postgresql-server"
   - "postgresql-contrib"
diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index 4c3e9273d2..59439a175d 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -18,7 +18,7 @@
   yum: pkg=mod_ssl state=present
 
 - name: Set httpd_use_nfs seboolean
-  action: seboolean name=httpd_use_nfs state=yes persistent=yes
+  seboolean: name=httpd_use_nfs state=yes persistent=yes
 
 - name: check the selinux context rsyncd log
   command: matchpathcon /var/log/rsyncd-fedora.log
diff --git a/roles/easyfix/gather/tasks/main.yml b/roles/easyfix/gather/tasks/main.yml
index a14afc6518..322ce66754 100644
--- a/roles/easyfix/gather/tasks/main.yml
+++ b/roles/easyfix/gather/tasks/main.yml
@@ -3,14 +3,14 @@
 
 ## Create all the folder used/needed
 - name: Create the easyfix folder
-  action: file state=directory
+  file: state=directory
                path=/srv/web/easyfix
                owner=apache group=apache mode=0755
   tags:
   - easyfix
 
 - name: Create the easyfix configuration folder
-  action: file state=directory
+  file: state=directory
           path=/etc/fedora-gather-easyfix/
           owner=root group=root mode=0755
   tags:
diff --git a/roles/elections/tasks/main.yml b/roles/elections/tasks/main.yml
index 93da2d463f..57d7a73738 100644
--- a/roles/elections/tasks/main.yml
+++ b/roles/elections/tasks/main.yml
@@ -42,7 +42,7 @@
   - restart apache
 
 - name: set sebooleans so fedora-elections can talk to the db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
   tags:
@@ -68,7 +68,7 @@
   - elections
 
 - name: set sebooleans so apache can talk to memcached0*
-  action: seboolean name=httpd_can_network_memcache
+  seboolean: name=httpd_can_network_memcache
                     state=true
                     persistent=true
   tags:
diff --git a/roles/fas_client/handlers/main.yml b/roles/fas_client/handlers/main.yml
index 354ef9d89b..8f87af0784 100644
--- a/roles/fas_client/handlers/main.yml
+++ b/roles/fas_client/handlers/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: run fasclient
-  action: command /usr/bin/fasClient -i
+  command: /usr/bin/fasClient -i
diff --git a/roles/fedocal/tasks/main.yml b/roles/fedocal/tasks/main.yml
index 1090138e1a..3bd7f8ad87 100644
--- a/roles/fedocal/tasks/main.yml
+++ b/roles/fedocal/tasks/main.yml
@@ -55,7 +55,7 @@
   - config
 
 - name: set sebooleans so fedocal can talk to the db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
 
diff --git a/roles/graphite/fedmsg2statsd/tasks/main.yml b/roles/graphite/fedmsg2statsd/tasks/main.yml
index 6d9bde831b..ef92e53f9d 100644
--- a/roles/graphite/fedmsg2statsd/tasks/main.yml
+++ b/roles/graphite/fedmsg2statsd/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: add repo
-  action: copy src=cabal-install.repo dest=/etc/yum.repos.d/cabal-install.repo
+  copy: src=cabal-install.repo dest=/etc/yum.repos.d/cabal-install.repo
   tags:
   - cabal-install
   - packages
diff --git a/roles/graphite/grafana/tasks/main.yml b/roles/graphite/grafana/tasks/main.yml
index 1fd9204cb8..1f983de6d8 100644
--- a/roles/graphite/grafana/tasks/main.yml
+++ b/roles/graphite/grafana/tasks/main.yml
@@ -12,7 +12,7 @@
   rpm_key: state=present key=https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana
 
 - name: add repo
-  action: copy src=grafana.repo dest=/etc/yum.repos.d/grafana.repo
+  copy: src=grafana.repo dest=/etc/yum.repos.d/grafana.repo
   tags:
   - grafana
   - packages
@@ -25,7 +25,7 @@
   - packages
 
 - name: set sebool so apache can talk to grafana-server
-  action: seboolean name=httpd_can_network_connect
+  seboolean: name=httpd_can_network_connect
                     state=true
                     persistent=true
 
diff --git a/roles/hosts/tasks/main.yml b/roles/hosts/tasks/main.yml
index c74827e648..55c75371d0 100644
--- a/roles/hosts/tasks/main.yml
+++ b/roles/hosts/tasks/main.yml
@@ -10,7 +10,7 @@
 # Note that if it's not set it will just skip this play and do nothing. 
 #
 - name: setup /etc/hosts for some clients
-  action: copy src={{ item }} dest=/etc/hosts
+  copy: src={{ item }} dest=/etc/hosts
   with_first_found:
   - files:
     - "{{ inventory_hostname }}-hosts"
diff --git a/roles/infinote/tasks/main.yml b/roles/infinote/tasks/main.yml
index 5bd6925238..07f63f0a30 100644
--- a/roles/infinote/tasks/main.yml
+++ b/roles/infinote/tasks/main.yml
@@ -82,7 +82,7 @@
   - config
 
 - name: enable infinoted 
-  action: service name=infinoted state=running enabled=true
+  service: name=infinoted state=running enabled=true
   tags:
   - infinote
   - config
diff --git a/roles/ipsilon/tasks/main.yml b/roles/ipsilon/tasks/main.yml
index 3f66e18011..0abaf99852 100644
--- a/roles/ipsilon/tasks/main.yml
+++ b/roles/ipsilon/tasks/main.yml
@@ -119,7 +119,7 @@
   when: env == "staging"
 
 - name: set sebooleans so ipsilon can talk to the db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
 
diff --git a/roles/jenkins/master/tasks/main.yml b/roles/jenkins/master/tasks/main.yml
index ac372c66f9..1beb30d819 100644
--- a/roles/jenkins/master/tasks/main.yml
+++ b/roles/jenkins/master/tasks/main.yml
@@ -39,13 +39,13 @@
   - packages
 
 - name: mount jenkins persistent storage
-  action: mount name=/var/lib/jenkins src='LABEL=jenkins' fstype=ext4 state=mounted
+  mount: name=/var/lib/jenkins src='LABEL=jenkins' fstype=ext4 state=mounted
   tags:
   - jenkins
   - jenkins/master
 
 - name: Install custom jenkins plugins (from ansible bigfiles)
-  action: copy src="{{ bigfiles }}/jenkins/{{ item }}.hpi" dest=/var/lib/jenkins/plugins/{{ item }}.hpi
+  copy: src="{{ bigfiles }}/jenkins/{{ item }}.hpi" dest=/var/lib/jenkins/plugins/{{ item }}.hpi
   with_items:
   - fedmsg
   notify:
@@ -104,14 +104,14 @@
   - config
 
 - name: install private ssh key
-  action: copy src="{{ private }}/files/jenkins/ssh/jenkins_master" dest=/etc/jenkins/id_rsa mode=400 owner=jenkins group=jenkins
+  copy: src="{{ private }}/files/jenkins/ssh/jenkins_master" dest=/etc/jenkins/id_rsa mode=400 owner=jenkins group=jenkins
   tags:
   - jenkins
   - jenkins/master
   - config
 
 - name: enable jenkins service to start on boot
-  action: service name=jenkins state=running enabled=true
+  service: name=jenkins state=running enabled=true
   tags:
   - jenkins
   - jenkins/master
diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml
index d91aa1dd6e..2147501d93 100644
--- a/roles/jenkins/slave/tasks/main.yml
+++ b/roles/jenkins/slave/tasks/main.yml
@@ -53,14 +53,14 @@
   - packages
 
 - name: create jenkins user
-  action: user name=jenkins state=present createhome=yes system=no groups=mock
+  user: name=jenkins state=present createhome=yes system=no groups=mock
   tags:
   - jenkins
   - jenkins/slave
   - config
 
 - name: add jenkins ssh public key to authorized keys
-  action: authorized_key user=jenkins key="{{ item }}"
+  authorized_key: user=jenkins key="{{ item }}"
   with_file:
   - "{{ private }}/files/jenkins/ssh/jenkins_master.pub"
   tags:
@@ -69,7 +69,7 @@
   - config
 
 - name: create workspace directory
-  action: file state=directory path=/srv/jenkins owner=jenkins group=jenkins
+  file: state=directory path=/srv/jenkins owner=jenkins group=jenkins
   tags:
   - jenkins
   - jenkins/slave
diff --git a/roles/kerneltest/tasks/main.yml b/roles/kerneltest/tasks/main.yml
index 0a3e5a8d2b..26ff06718a 100644
--- a/roles/kerneltest/tasks/main.yml
+++ b/roles/kerneltest/tasks/main.yml
@@ -21,7 +21,7 @@
   - kerneltest
 
 - name: Create the folder to store the logs
-  action: file state=directory
+  file: state=directory
                path=/var/www/logs
                owner=apache group=apache mode=0755
   tags:
diff --git a/roles/keyserver/handlers/main.yml b/roles/keyserver/handlers/main.yml
index eee9214e54..259ede782f 100644
--- a/roles/keyserver/handlers/main.yml
+++ b/roles/keyserver/handlers/main.yml
@@ -1,6 +1,6 @@
 - name: restart sks-db
-  action: service name=sks-db state=restarted
+  service: name=sks-db state=restarted
 
 - name: restart sks-recon
-  action: service name=sks-recon state=restarted
+  service: name=sks-recon state=restarted
 
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index b6ee070ccb..f8bb9f9ca0 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -277,7 +277,7 @@
   - koji_builder
 
 - name: set kernel params for more loops
-  action: command /sbin/grubby --update-kernel=ALL --args=max_loop=64 
+  command: /sbin/grubby --update-kernel=ALL --args=max_loop=64 
   when: max_loop is defined and max_loop.stdout.find("max_loop=64") == -1
   tags:
   - koji_builder
diff --git a/roles/koschei/tasks/main.yml b/roles/koschei/tasks/main.yml
index 5acf5e1f8c..3b0481da60 100644
--- a/roles/koschei/tasks/main.yml
+++ b/roles/koschei/tasks/main.yml
@@ -90,7 +90,7 @@
   - config
 
 - name: enable services to start on boot
-  action: service name={{ item }} state=running enabled=true
+  service: name={{ item }} state=running enabled=true
   with_items:
   - koschei-polling
   - koschei-resolver
diff --git a/roles/mailman/handlers/main.yml b/roles/mailman/handlers/main.yml
index 700e2d94b9..8efdefd78f 100644
--- a/roles/mailman/handlers/main.yml
+++ b/roles/mailman/handlers/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: restart mailman3
-  action: service name=mailman3 state=restarted
+  service: name=mailman3 state=restarted
 
 - name: reload apache
-  action: service name=httpd state=reloaded
+  service: name=httpd state=reloaded
 
 - name: restart memcached
-  action: service name=memcached state=restarted
+  service: name=memcached state=restarted
diff --git a/roles/mdapi/tasks/main.yml b/roles/mdapi/tasks/main.yml
index c4d181883e..d884654de6 100644
--- a/roles/mdapi/tasks/main.yml
+++ b/roles/mdapi/tasks/main.yml
@@ -12,7 +12,7 @@
   - packages
 
 - name: create all the directory for the configuration file
-  action: file state=directory path=/etc/mdapi
+  file: state=directory path=/etc/mdapi
   tags:
   - mdapi
   - config
diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml
index 31008582e6..759a1e0909 100644
--- a/roles/mediawiki/tasks/main.yml
+++ b/roles/mediawiki/tasks/main.yml
@@ -20,7 +20,7 @@
   - mediawiki
 
 - name: set sebooleans so apache can send emails
-  action: seboolean name=httpd_can_sendmail state=yes persistent=yes
+  seboolean: name=httpd_can_sendmail state=yes persistent=yes
   tags:
   - mediawiki
 
diff --git a/roles/mediawiki123/tasks/main.yml b/roles/mediawiki123/tasks/main.yml
index f2a097a918..3c2b74420f 100644
--- a/roles/mediawiki123/tasks/main.yml
+++ b/roles/mediawiki123/tasks/main.yml
@@ -20,7 +20,7 @@
   - mediawiki
 
 - name: set sebooleans so apache can send emails
-  action: seboolean name=httpd_can_sendmail state=yes persistent=yes
+  seboolean: name=httpd_can_sendmail state=yes persistent=yes
   tags:
   - mediawiki
 
diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml
index 7849d670cc..b2ed34e147 100644
--- a/roles/mirrormanager/frontend2/tasks/main.yml
+++ b/roles/mirrormanager/frontend2/tasks/main.yml
@@ -43,7 +43,7 @@
   - config
 
 - name: set sebooleans so mirrormanager can connect to its db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
   tags:
@@ -51,7 +51,7 @@
   - config
 
 - name: set sebooleans so mirrormanager can send exception mails
-  action: seboolean name=httpd_can_sendmail
+  seboolean: name=httpd_can_sendmail
                     state=true
                     persistent=true
   tags:
diff --git a/roles/mote/tasks/main.yml b/roles/mote/tasks/main.yml
index 231775987a..71bcdb88c2 100644
--- a/roles/mote/tasks/main.yml
+++ b/roles/mote/tasks/main.yml
@@ -58,7 +58,7 @@
   - selinux
 
 - name: set sebooleans so apache can use memcached
-  action: seboolean name=httpd_can_network_memcache
+  seboolean: name=httpd_can_network_memcache
                     state=true
                     persistent=true
   tags:
diff --git a/roles/nagios_client/handlers/main.yml b/roles/nagios_client/handlers/main.yml
index 1086c3d4f6..11c84acd9b 100644
--- a/roles/nagios_client/handlers/main.yml
+++ b/roles/nagios_client/handlers/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: restart nrpe
-  action: service name=nrpe state=restarted
+  service: name=nrpe state=restarted
diff --git a/roles/nagios_server/handlers/main.yml b/roles/nagios_server/handlers/main.yml
index 1086c3d4f6..11c84acd9b 100644
--- a/roles/nagios_server/handlers/main.yml
+++ b/roles/nagios_server/handlers/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: restart nrpe
-  action: service name=nrpe state=restarted
+  service: name=nrpe state=restarted
diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
index 895d0e4443..d16c4b88d1 100644
--- a/roles/nfs/client/tasks/main.yml
+++ b/roles/nfs/client/tasks/main.yml
@@ -64,7 +64,7 @@
   - nfs/client
 
 - name: enable nfs-related services and run them (rhel6)
-  action: service name={{ item }}  enabled=true state=started
+  service: name={{ item }}  enabled=true state=started
   with_items:
   - rpcidmapd
   - rpcbind
diff --git a/roles/nfs/server/tasks/main.yml b/roles/nfs/server/tasks/main.yml
index 5563340e67..c8440e8bae 100644
--- a/roles/nfs/server/tasks/main.yml
+++ b/roles/nfs/server/tasks/main.yml
@@ -16,7 +16,7 @@
   - nfs/server
 
 - name: enable nfs-related services and run them (fedora)
-  action: service name={{ item }}  enabled=true state=started
+  service: name={{ item }}  enabled=true state=started
   with_items:
   - nfs-idmap
   - rpc-statd
@@ -25,7 +25,7 @@
   - nfs/server
 
 - name: enable nfs-related services and run them (rhel)
-  action: service name={{ item }}  enabled=true state=started
+  service: name={{ item }}  enabled=true state=started
   with_items:
   - rpcbind
   - nfs-server
diff --git a/roles/nuancier/tasks/main.yml b/roles/nuancier/tasks/main.yml
index 531490b925..c08e665c27 100644
--- a/roles/nuancier/tasks/main.yml
+++ b/roles/nuancier/tasks/main.yml
@@ -30,7 +30,7 @@
   - restart apache
 
 - name: create pictures folder where we upload the pictures
-  action: file state=directory
+  file: state=directory
                path=/var/cache/nuancier/pictures
                owner=apache group=apache mode=0700
   tags:
@@ -38,7 +38,7 @@
   - nuancier
 
 - name: create the cache folder where nuancier creates the thumbnails
-  action: file state=directory
+  file: state=directory
                path=/var/cache/nuancier/cache
                owner=apache group=apache mode=0700
   tags:
@@ -69,7 +69,7 @@
   - restart apache
 
 - name: set sebooleans so nuancier can talk to the db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
   tags:
@@ -87,7 +87,7 @@
   - selinux
 
 - name: set sebooleans so apache can use glusterfs
-  action: seboolean name=httpd_use_fusefs
+  seboolean: name=httpd_use_fusefs
                     state=true
                     persistent=true
   tags:
@@ -95,7 +95,7 @@
   - selinux
 
 - name: set sebooleans so apache can send emails
-  action: seboolean name=httpd_can_sendmail
+  seboolean: name=httpd_can_sendmail
                     state=true
                     persistent=true
   tags:
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index d8901626a1..6d5e79181e 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -124,14 +124,14 @@
   delegate_to: "{{ openqa_dbhost }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_db db={{ openqa_dbname }}
+  postgresql_db: db={{ openqa_dbname }}
   when: "openqa_dbhost is defined"
 
 - name: Ensure db user has access to database
   delegate_to: "{{ openqa_dbhost }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ openqa_dbname }} user={{ openqa_dbuser }} password={{ openqa_dbpassword }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ openqa_dbname }} user={{ openqa_dbuser }} password={{ openqa_dbpassword }} role_attr_flags=NOSUPERUSER
   when: "openqa_dbhost is defined"
 
 - name: Database config
diff --git a/roles/pagure/frontend/tasks/main.yml b/roles/pagure/frontend/tasks/main.yml
index e7136df548..a59c49cd19 100644
--- a/roles/pagure/frontend/tasks/main.yml
+++ b/roles/pagure/frontend/tasks/main.yml
@@ -50,7 +50,7 @@
   - pagure
 
 - name: create the /srv/git/.gitolite/conf folder
-  action: file state=directory
+  file: state=directory
                path=/srv/git/.gitolite/conf
                owner=git group=git mode=0775
   tags:
@@ -58,7 +58,7 @@
   - pagure
 
 - name: create the /srv/git/.gitolite/keydir folder
-  action: file state=directory
+  file: state=directory
                path=/srv/git/.gitolite/keydir
                owner=git group=git mode=0775
   tags:
@@ -66,7 +66,7 @@
   - pagure
 
 - name: create the /srv/git/.gitolite/logs folder
-  action: file state=directory
+  file: state=directory
                path=/srv/git/.gitolite/logs
                owner=git group=git mode=0775
   tags:
@@ -94,7 +94,7 @@
   - pagure
 
 - name: create all the directories where we store the git repos
-  action: file state=directory
+  file: state=directory
                path={{ item }}
                owner=git group=git mode=0775
   with_items:
@@ -109,7 +109,7 @@
   - pagure
 
 - name: create the /srv/tmp folder where to clone repos
-  action: file state=directory
+  file: state=directory
                path=/srv/tmp
                owner=git group=git mode=0775
   tags:
@@ -166,7 +166,7 @@
 # Set-up Pagure
 
 - name: create the /var/www/releases folder
-  action: file state=directory
+  file: state=directory
                path=/var/www/releases
                owner=git group=git mode=0775
   tags:
@@ -258,7 +258,7 @@
   - pagure
 
 - name: set sebooleans so pagure can talk to the db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
   tags:
@@ -267,7 +267,7 @@
   - pagure
 
 - name: set sebooleans so apache can send emails
-  action: seboolean name=httpd_can_sendmail
+  seboolean: name=httpd_can_sendmail
                     state=true
                     persistent=true
   tags:
diff --git a/roles/pdc/tasks/main.yml b/roles/pdc/tasks/main.yml
index 2e56df5b9c..2bd33c0ad2 100644
--- a/roles/pdc/tasks/main.yml
+++ b/roles/pdc/tasks/main.yml
@@ -41,7 +41,7 @@
   - pdc
 
 - name: create /etc/httpd/saml2
-  action: file state=directory
+  file: state=directory
                path=/etc/httpd/saml2
                owner=apache group=apache mode=0775
   tags:
diff --git a/roles/phabricator/handlers/main.yml b/roles/phabricator/handlers/main.yml
index 0d2e15df7a..bedb6ac8e1 100644
--- a/roles/phabricator/handlers/main.yml
+++ b/roles/phabricator/handlers/main.yml
@@ -3,5 +3,5 @@
 #
 
 - name: restart phd
-  action: service name=phd state=restarted
+  service: name=phd state=restarted
 
diff --git a/roles/pkgdb2/tasks/main.yml b/roles/pkgdb2/tasks/main.yml
index 3d32473591..5e193e239b 100644
--- a/roles/pkgdb2/tasks/main.yml
+++ b/roles/pkgdb2/tasks/main.yml
@@ -79,7 +79,7 @@
   - pkgdb
 
 - name: set sebooleans so pkgdb2 can talk to the db
-  action: seboolean name=httpd_can_network_connect_db
+  seboolean: name=httpd_can_network_connect_db
                     state=true
                     persistent=true
   tags:
@@ -87,7 +87,7 @@
   - pkgdb
 
 - name: set sebooleans so apache can send emails
-  action: seboolean name=httpd_can_sendmail
+  seboolean: name=httpd_can_sendmail
                     state=true
                     persistent=true
   tags:
@@ -95,7 +95,7 @@
   - pkgdb
 
 - name: set sebooleans so apache can talk to memcached0*
-  action: seboolean name=httpd_can_network_memcache
+  seboolean: name=httpd_can_network_memcache
                     state=true
                     persistent=true
   tags:
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 11e67b9707..95c5677d09 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -1,62 +1,62 @@
 - name: set root passwd
-  action: user name=root password={{ builder_rootpw }} state=present
+  user: name=root password={{ builder_rootpw }} state=present
 
 - name: add mock user as 425
-  action: user name=mock uid=425 state=present home=/var/lib/mock createhome=yes system=yes
+  user: name=mock uid=425 state=present home=/var/lib/mock createhome=yes system=yes
 - name: make mock homedir 2775
-  action: file state=directory path=/var/lib/mock mode=2775 owner=mock group=mock
+  file: state=directory path=/var/lib/mock mode=2775 owner=mock group=mock
 - name: add mock ssh dir
-  action: file state=directory path=/var/lib/mock/.ssh mode=700 owner=mock group=mock
+  file: state=directory path=/var/lib/mock/.ssh mode=700 owner=mock group=mock
 - name: add mock ssh keys
-  action: copy src="{{ files }}/../roles/koji_builder/files//mock_auth_keys" dest=/var/lib/mock/.ssh/authorized_keys mode=644 owner=mock group=mock
+  copy: src="{{ files }}/../roles/koji_builder/files//mock_auth_keys" dest=/var/lib/mock/.ssh/authorized_keys mode=644 owner=mock group=mock
 
 - name: add ftpsync group
-  action: group name=ftpsync gid=263 system=yes state=present
+  group: name=ftpsync gid=263 system=yes state=present
 
 - name: add ftpsync user
   user: name=ftpsync uid=263 group=ftpsync createhome=yes system=yes state=present
 
 - name: add the ftpsync update-fullfilelist script
-  action: copy src=update-fullfilelist dest=/usr/local/bin/update-fullfilelist owner=ftpsync group=ftpsync mode=555
+  copy: src=update-fullfilelist dest=/usr/local/bin/update-fullfilelist owner=ftpsync group=ftpsync mode=555
 
 - name: add masher group
-  action: group name=masher gid=751 system=yes state=present
+  group: name=masher gid=751 system=yes state=present
 # masher user 751
 - name: add masher user as 751 - and group
-  action: user name=masher uid=751 group=masher home=/home/masher groups=mock,ftpsync
+  user: name=masher uid=751 group=masher home=/home/masher groups=mock,ftpsync
 # masher ssh keys and config
 - name: add masher ssh dir
-  action: file state=directory path=/home/masher/.ssh mode=700 owner=masher group=masher
+  file: state=directory path=/home/masher/.ssh mode=700 owner=masher group=masher
 - name: add masher ssh keys
-  action: copy src="mash/masher.{{ item }}" dest="/home/masher/.ssh/{{ item }}" mode=600 owner=masher group=masher
+  copy: src="mash/masher.{{ item }}" dest="/home/masher/.ssh/{{ item }}" mode=600 owner=masher group=masher
   with_items:
     - id_rsa.pub
     - config
 
 - name: add masher ssh priv key
-  action: copy src="{{ private }}/files/mash/masher.id_rsa" dest=/home/masher/.ssh/id_rsa mode=600 owner=masher group=masher
+  copy: src="{{ private }}/files/mash/masher.id_rsa" dest=/home/masher/.ssh/id_rsa mode=600 owner=masher group=masher
 
 - name: add masher koji cert/key
-  action: copy src="{{ private }}/files/mash/masher.pem" dest=/home/masher/.fedora.cert mode=600 owner=masher group=masher
+  copy: src="{{ private }}/files/mash/masher.pem" dest=/home/masher/.fedora.cert mode=600 owner=masher group=masher
 - name: add masher koji ca cert
-  action: copy src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-server-ca.cert
+  copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-server-ca.cert
 - name: add masher koji ca upload cert
-  action: copy src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-upload-ca.cert
+  copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-upload-ca.cert
 
 - name: add koji ca cert to central system ca-trust
-  action: copy src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/etc/pki/ca-trust/source/anchors/fedora-server-ca.cert
+  copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/etc/pki/ca-trust/source/anchors/fedora-server-ca.cert
 - name: update ca-trust
   command: /usr/bin/update-ca-trust
 
 # rawhide group
 - name: rawhide group
-  action: group name=rawhide gid=265
+  group: name=rawhide gid=265
 # rawhide user 265
 - name: add rawhide user
-  action: user name=rawhide uid=265 group=rawhide home=/tmp comment="rawhide compose account"
+  user: name=rawhide uid=265 group=rawhide home=/tmp comment="rawhide compose account"
  
 - name: make a bunch of dirs
-  action: file state=directory path={{ item }}
+  file: state=directory path={{ item }}
   with_items:
     - /pub
     - /epel
@@ -127,55 +127,55 @@
 
 # idmapd and make sure it's set to run
 - name: idmapd.conf
-  action: copy src="{{ files }}/../roles/koji_builder/files//idmapd.conf" dest=/etc/idmapd.conf
+  copy: src="{{ files }}/../roles/koji_builder/files//idmapd.conf" dest=/etc/idmapd.conf
   tags:
   - configs
 
 - name: make a mnt/koji link
-  action: file state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
+  file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
   when: inventory_hostname.startswith(('compose-x86-01'))
 
 - name: symlink /srv/pungi
-  action: file src=/mnt/fedora_koji/compose dest=/srv/pungi  state=link
+  file: src=/mnt/fedora_koji/compose dest=/srv/pungi  state=link
   when: not inventory_hostname.startswith('compose-aarch64-01')
 
 - name: add pkgs for nightly compose
-  action: yum  state=present pkg={{ item }}
+  yum:  state=present pkg={{ item }}
   with_items:
     - packagedb-cli
   when: inventory_hostname.startswith('branched-composer') or inventory_hostname.startswith('rawhide-composer') or inventory_hostname.startswith('composer.stg')
 
 # put cron job in for branched compose
 - name: branched compose cron
-  action: copy src="branched" dest=/etc/cron.d/branched
+  copy: src="branched" dest=/etc/cron.d/branched
   when: inventory_hostname.startswith('branched-composer')
 
 # put cron job in for rawhide compose
 - name: rawhide compose cron
-  action: copy src="rawhide" dest=/etc/cron.d/rawhide
+  copy: src="rawhide" dest=/etc/cron.d/rawhide
   when: inventory_hostname.startswith('rawhide-composer')
 
 # put cron job in for aarch64 branched compose
 - name: aarch64 branched compose cron
-  action: copy src="aarch64.branched" dest=/etc/cron.d/branched
+  copy: src="aarch64.branched" dest=/etc/cron.d/branched
   when: inventory_hostname.startswith('compose-aarch64-01')
 
 # put cron job in for aarch64 rawhide compose
 - name: aarch64 rawhide compose cron
-  action: copy src="aarch64.rawhide" dest=/etc/cron.d/rawhide
+  copy: src="aarch64.rawhide" dest=/etc/cron.d/rawhide
   when: inventory_hostname.startswith('compose-aarch64-01')
 
 # put cron job in for two-week nightly compose
 - name: twoweek compose cron
-  action: copy src="twoweek-updates" dest=/etc/cron.d/twoweek-updates
+  copy: src="twoweek-updates" dest=/etc/cron.d/twoweek-updates
   when: inventory_hostname.startswith('compose-x86-01')
 
 - name: sudoers defaults
-  action: copy src="{{ private }}/files/sudo/releng-sudoers" dest=/etc/sudoers mode=0440
+  copy: src="{{ private }}/files/sudo/releng-sudoers" dest=/etc/sudoers mode=0440
   tags:
   - configs
 - name: sudoers for ftpsync
-  action: copy src="{{ private }}/files/sudo/ftpsync-sudo" dest=/etc/sudoers.d/ftpsync mode=0440
+  copy: src="{{ private }}/files/sudo/ftpsync-sudo" dest=/etc/sudoers.d/ftpsync mode=0440
   tags:
   - configs
 
diff --git a/roles/rsyncd/tasks/main.yml b/roles/rsyncd/tasks/main.yml
index ef57d2af13..7d1a83b5bd 100644
--- a/roles/rsyncd/tasks/main.yml
+++ b/roles/rsyncd/tasks/main.yml
@@ -55,7 +55,7 @@
   - services
 
 - name: set sebooleans so rsync can read dirs
-  action: seboolean name=rsync_export_all_ro
+  seboolean: name=rsync_export_all_ro
                     state=true
                     persistent=true
 
diff --git a/roles/sudo/tasks/main.yml b/roles/sudo/tasks/main.yml
index 6b70b1d85a..c3b419d5b6 100644
--- a/roles/sudo/tasks/main.yml
+++ b/roles/sudo/tasks/main.yml
@@ -36,7 +36,7 @@
 # This will move a /etc/sudoers.d/ file in place 
 #
 - name: setup /etc/sudoers.d/sudoer file for client use
-  action: copy src={{ item }} dest=/etc/sudoers.d/{{ item | basename | replace('.', '_') }}
+  copy: src={{ item }} dest=/etc/sudoers.d/{{ item | basename | replace('.', '_') }}
           owner=root group=root mode=0600
   with_first_found:
   - files:
diff --git a/roles/taiga/handlers/main.yml b/roles/taiga/handlers/main.yml
index 1dc916c8ca..21aade7827 100644
--- a/roles/taiga/handlers/main.yml
+++ b/roles/taiga/handlers/main.yml
@@ -12,4 +12,4 @@
   service: name=nginx state=restarted
 
 - name: restart postfix
-  action: service name=postfix state=restarted
+  service: name=postfix state=restarted
diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml
index 9d6c8c7184..9f76865847 100644
--- a/roles/taskotron/buildmaster/tasks/main.yml
+++ b/roles/taskotron/buildmaster/tasks/main.yml
@@ -63,35 +63,35 @@
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_db db={{ buildmaster_db_name }}
+  postgresql_db: db={{ buildmaster_db_name }}
 
 - name: ensure dev db user has access to dev database
   when: deployment_type == 'dev'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ buildmaster_db_name }} user={{ dev_buildmaster_db_user }} password={{ dev_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ buildmaster_db_name }} user={{ dev_buildmaster_db_user }} password={{ dev_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure stg db user has access to stg database
   when: deployment_type == 'stg'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ buildmaster_db_name }} user={{ stg_buildmaster_db_user }} password={{ stg_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ buildmaster_db_name }} user={{ stg_buildmaster_db_user }} password={{ stg_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure prod db user has access to prod database
   when: deployment_type == 'prod'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ buildmaster_db_name }} user={{ prod_buildmaster_db_user }} password={{ prod_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ buildmaster_db_name }} user={{ prod_buildmaster_db_user }} password={{ prod_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure local db user has access to local database
   when: deployment_type == 'local'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ buildmaster_db_name }} user={{ local_buildmaster_db_user }} password={{ local_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ buildmaster_db_name }} user={{ local_buildmaster_db_user }} password={{ local_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: put robots.txt at web root of external hostname
   when: robots_path is defined
diff --git a/roles/taskotron/execdb/tasks/main.yml b/roles/taskotron/execdb/tasks/main.yml
index da153df4d5..6b930ffedf 100644
--- a/roles/taskotron/execdb/tasks/main.yml
+++ b/roles/taskotron/execdb/tasks/main.yml
@@ -21,35 +21,35 @@
   delegate_to: "{{ execdb_db_host_machine }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_db db={{ execdb_db_name }}
+  postgresql_db: db={{ execdb_db_name }}
 
 - name: ensure dev execdb db user has access to dev database
   when: deployment_type == 'dev'
   delegate_to: "{{ execdb_db_host_machine }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ execdb_db_name }} user={{ execdb_db_user }} password={{ execdb_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ execdb_db_name }} user={{ execdb_db_user }} password={{ execdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure stg execdb db user has access to stg database
   when: deployment_type == 'stg'
   delegate_to: "{{ execdb_db_host }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ execdb_db_name }} user={{ stg_execdb_db_user }} password={{ stg_execdb_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ execdb_db_name }} user={{ stg_execdb_db_user }} password={{ stg_execdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure prod execdb db user has access to prod database
   when: deployment_type == 'prod'
   delegate_to: "{{ execdb_db_host }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ execdb_db_name }} user={{ prod_execdb_db_user }} password={{ prod_execdb_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ execdb_db_name }} user={{ prod_execdb_db_user }} password={{ prod_execdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure local execdb db user has access to prod database
   when: deployment_type == 'local'
   delegate_to: "{{ execdb_db_host }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ execdb_db_name }} user={{ local_execdb_db_user }} password={{ local_execdb_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ execdb_db_name }} user={{ local_execdb_db_user }} password={{ local_execdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure selinux lets httpd talk to postgres
   seboolean: name=httpd_can_network_connect_db persistent=yes state=yes
diff --git a/roles/taskotron/fake_fedorainfra/tasks/main.yml b/roles/taskotron/fake_fedorainfra/tasks/main.yml
index ba89f0eb5a..94b272e4dc 100644
--- a/roles/taskotron/fake_fedorainfra/tasks/main.yml
+++ b/roles/taskotron/fake_fedorainfra/tasks/main.yml
@@ -1,12 +1,12 @@
 - name: ensure packages required for fakefedorainfra are installed
-  action: yum name={{ item }} state=latest
+  yum: name={{ item }} state=latest
   when: deployment_type == 'prod' or deployment_type == 'local'
   with_items:
     - mod_wsgi
     - fake_fedorainfra
 
 - name: ensure packages required for fakefedorainfra are installed (infra-testing)
-  action: yum name={{ item }} state=latest enablerepo=infrastructure-testing
+  yum: name={{ item }} state=latest enablerepo=infrastructure-testing
   when: deployment_type == 'dev' or deployment_type == 'stg'
   with_items:
     - mod_wsgi
@@ -16,28 +16,28 @@
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_db db={{ fakefedorainfra_db_name }}
+  postgresql_db: db={{ fakefedorainfra_db_name }}
 
 - name: ensure stg fakefedorainfra user has access to stg database
   when: deployment_type == 'stg'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ fakefedorainfra_db_name }} user={{ stg_fakefedorainfra_db_user }} password={{ stg_fakefedorainfra_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ fakefedorainfra_db_name }} user={{ stg_fakefedorainfra_db_user }} password={{ stg_fakefedorainfra_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure dev fakefedorainfra user has access to dev database
   when: deployment_type == 'dev'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ fakefedorainfra_db_name }} user={{ dev_fakefedorainfra_db_user }} password={{ dev_fakefedorainfra_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ fakefedorainfra_db_name }} user={{ dev_fakefedorainfra_db_user }} password={{ dev_fakefedorainfra_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure local fakefedorainfra user has access to local database
   when: deployment_type == 'local'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ fakefedorainfra_db_name }} user={{ local_fakefedorainfra_db_user }} password={{ local_fakefedorainfra_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ fakefedorainfra_db_name }} user={{ local_fakefedorainfra_db_user }} password={{ local_fakefedorainfra_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: generate fakefedorainfra config
   template: src=settings.py.j2 dest=/etc/fake_fedorainfra/settings.py owner=root group=root mode=0644
diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml
index e3e389e541..5417e631cb 100644
--- a/roles/taskotron/resultsdb-backend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-backend/tasks/main.yml
@@ -21,28 +21,28 @@
   delegate_to: "{{ resultsdb_db_host_machine }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_db db={{ resultsdb_db_name }}
+  postgresql_db: db={{ resultsdb_db_name }}
 
 - name: ensure resultsdb db user has access to database
   when: deployment_type == 'dev' or deployment_type == 'local'
   delegate_to: "{{ resultsdb_db_host_machine }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ resultsdb_db_name }} user={{ resultsdb_db_user }} password={{ resultsdb_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ resultsdb_db_name }} user={{ resultsdb_db_user }} password={{ resultsdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure stg resultsdb db user has access to stg database
   when: deployment_type == 'stg'
   delegate_to: "{{ resultsdb_db_host }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ resultsdb_db_name }} user={{ stg_resultsdb_db_user }} password={{ stg_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ resultsdb_db_name }} user={{ stg_resultsdb_db_user }} password={{ stg_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure prod resultsdb db user has access to prod database
   when: deployment_type == 'prod'
   delegate_to: "{{ resultsdb_db_host }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ resultsdb_db_name }} user={{ prod_resultsdb_db_user }} password={{ prod_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ resultsdb_db_name }} user={{ prod_resultsdb_db_user }} password={{ prod_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure selinux lets httpd talk to postgres
   seboolean: name=httpd_can_network_connect_db persistent=yes state=yes
diff --git a/roles/testdays/tasks/main.yml b/roles/testdays/tasks/main.yml
index 8d160392fa..b86ff5d70b 100644
--- a/roles/testdays/tasks/main.yml
+++ b/roles/testdays/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: ensure packages required for testdays  are installed
-  action: yum name={{ item }} state=present
+  yum: name={{ item }} state=present
   with_items:
     - testdays
     - mod_wsgi
@@ -11,13 +11,13 @@
   delegate_to: "{{ testdays_db_host }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_db db={{ testdays_db_name }}
+  postgresql_db: db={{ testdays_db_name }}
 
 - name: ensure testdays db user has access to database
   delegate_to: "{{ testdays_db_host }}"
   sudo_user: postgres
   sudo: true
-  action: postgresql_user db={{ testdays_db_name }} user={{ testdays_db_user }} password={{ testdays_db_password }} role_attr_flags=NOSUPERUSER
+  postgresql_user: db={{ testdays_db_name }} user={{ testdays_db_user }} password={{ testdays_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure selinux lets httpd talk to postgres
   seboolean: name=httpd_can_network_connect_db persistent=yes state=yes
diff --git a/roles/yubikey/tasks/main.yml b/roles/yubikey/tasks/main.yml
index c7dfdb2e34..20b9e9a5ec 100644
--- a/roles/yubikey/tasks/main.yml
+++ b/roles/yubikey/tasks/main.yml
@@ -19,7 +19,7 @@
   - { file: ykval-config.php, dest: /etc/ykval/ykval-config.php }
 
 - name: symlink the configuration files to /usr/share/...
-  action: file src={{item.file}} dest={{ item.dest }} state=link
+  file: src={{item.file}} dest={{ item.dest }} state=link
   with_items:
   - {file: /etc/ykval/ykval-config.php, dest: /usr/share/ykval/ykval-config.php }
   - {file: /etc/ykksm/ykksm-config.php, dest: /usr/share/ykksm/ykksm-config.php }