diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 85146c9020..390a9a8312 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -130,10 +130,10 @@ env_suffix:
 # nfs mount options, override at the group/host level
 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
 
-# by default set sudo to false here We can override it as needed. 
-# Note that if sudo is true, you need to unset requiretty for 
+# by default set become to false here We can override it as needed. 
+# Note that if become is true, you need to unset requiretty for 
 # ssh controlpersist to work. 
-sudo: false
+become: false
 
 # default the root_auth_users to nothing. 
 # This should be set for cloud instances in their host or group vars.
diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml
index 969450800e..b29be35845 100644
--- a/playbooks/groups/copr-dist-git.yml
+++ b/playbooks/groups/copr-dist-git.yml
@@ -1,8 +1,6 @@
 - name: check/create instance
   hosts: copr-dist-git-stg:copr-dist-git
   user: root
-  #user: centos
-  #sudo: True
   gather_facts: False
 
   vars_files:
@@ -17,8 +15,6 @@
 - name: cloud basic setup
   hosts: copr-dist-git-stg:copr-dist-git
   user: root
-  #user: centos
-  #sudo: True
   gather_facts: True
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
@@ -32,8 +28,6 @@
 - name: provision instance
   hosts: copr-dist-git-stg:copr-dist-git
   user: root
-  # user: centos
-  # sudo: True
   gather_facts: True
 
   vars_files:
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 729d230f19..3fc0d7586b 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -55,8 +55,8 @@
 - name: setup the database
   hosts: db01.stg.phx2.fedoraproject.org:db01.phx2.fedoraproject.org
   gather_facts: no
-  sudo: yes
-  sudo_user: postgres
+  become: yes
+  become_user: postgres
   vars_files:
   - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml
index 4f760b5337..15480f3679 100644
--- a/playbooks/groups/openstack-compute-nodes.yml
+++ b/playbooks/groups/openstack-compute-nodes.yml
@@ -2,8 +2,6 @@
 
 - name:  deploy Open Stack compute nodes
   hosts: openstack-compute
-  user:  root
-  sudo:  yes
   gather_facts: True
 
   vars_files: 
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 9dad3ab7c7..002acfb3fe 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -1,8 +1,6 @@
 ---
 - name:  Prepare storage on compute nodes
   hosts: openstack-compute
-  user:  root
-  sudo:  yes
   gather_facts: True
 
   vars_files:
@@ -21,8 +19,6 @@
 
 - name: deploy Open Stack controler
   hosts: fed-cloud09.cloud.fedoraproject.org
-  user: root
-  sudo: yes
   gather_facts: True
 
   vars:
diff --git a/playbooks/hosts/java-deptools.fedorainfracloud.org b/playbooks/hosts/java-deptools.fedorainfracloud.org
index c39e17cc8c..3223f7bb9d 100644
--- a/playbooks/hosts/java-deptools.fedorainfracloud.org
+++ b/playbooks/hosts/java-deptools.fedorainfracloud.org
@@ -1,7 +1,7 @@
 - name: check/create instance
   hosts: java-deptools.fedorainfracloud.org
-  user: fedora
-  sudo: True
+  become_user: fedora
+  become: True
   gather_facts: False
 
   vars_files:
@@ -15,8 +15,8 @@
 
 - name: setup all the things
   hosts: java-deptools.fedorainfracloud.org
-  user: fedora
-  sudo: True
+  become_user: fedora
+  become: True
   gather_facts: True
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
index 4cc320ab93..f818451607 100644
--- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
@@ -96,8 +96,8 @@
 - name: setup db users/passwords for mailman and hyperkitty
   hosts: lists-dev.fedorainfracloud.org
   gather_facts: no
-  sudo: yes
-  sudo_user: postgres
+  becom: yes
+  become_user: postgres
   vars_files: 
   - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
diff --git a/playbooks/ssh_host_keys.yml b/playbooks/ssh_host_keys.yml
index 44d8479c79..cbc9768346 100644
--- a/playbooks/ssh_host_keys.yml
+++ b/playbooks/ssh_host_keys.yml
@@ -1,5 +1,5 @@
 - hosts: all
-  sudo: False
+  become: False
   vars:
     keyfile: /tmp/known_hosts
   tasks:
diff --git a/playbooks/update_grokmirror_repos.yml b/playbooks/update_grokmirror_repos.yml
index b86cffbd77..7db0acd9f4 100644
--- a/playbooks/update_grokmirror_repos.yml
+++ b/playbooks/update_grokmirror_repos.yml
@@ -2,8 +2,8 @@
 
 - name: update grokmirror repos
   hosts: taskotron-dev:taskotron-stg:taskotron-prod
-  sudo: true
-  sudo_user: "{{ grokmirror_user }}"
+  become: true
+  become_user: "{{ grokmirror_user }}"
   gather_facts: false
 
   tasks:
diff --git a/roles/beaker/virthost/tasks/main.yml b/roles/beaker/virthost/tasks/main.yml
index 15b1eb6ed8..72838b0470 100644
--- a/roles/beaker/virthost/tasks/main.yml
+++ b/roles/beaker/virthost/tasks/main.yml
@@ -132,8 +132,8 @@
     group: "{{ libvirt_user }}"
   when: item.hostname not in result.list_vms
   with_items: clients
-  sudo: true
-  sudo_user: "{{ libvirt_user }}"
+  become: true
+  become_user: "{{ libvirt_user }}"
 
 - name: ensure the guest lvs are created
   lvol: lv={{ item.hostname }} vg={{ volgroup }} size={{ item.lvm_size }} state=present
@@ -144,6 +144,6 @@
   command: "virsh define --file /home/{{ libvirt_user }}/{{ item.hostname }}.libvirt.xml"
   when: item.hostname not in result.list_vms
   with_items: clients
-  sudo: true
-  sudo_user: "{{ libvirt_user }}"
+  become: true
+  become_user: "{{ libvirt_user }}"
 
diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml
index 442ca42aec..5583780f79 100644
--- a/roles/copr/frontend/tasks/main.yml
+++ b/roles/copr/frontend/tasks/main.yml
@@ -45,29 +45,29 @@
 
 - name: populate db
   command: ./manage.py create_db --alembic alembic.ini
-  sudo: yes
-  sudo_user: copr-fe
+  become: yes
+  become_user: copr-fe
   args:
     chdir: /usr/share/copr/coprs_frontend/
 
 - name: upgrade db to head
   command: alembic upgrade head
-  sudo: yes
-  sudo_user: copr-fe
+  become: yes
+  become_user: copr-fe
   args:
     chdir: /usr/share/copr/coprs_frontend/
 
 - name: set up chroots
   command: ./manage.py create_chroot epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-20-i386 fedora-20-x86_64 fedora-21-i386 fedora-21-x86_64 fedora-22-i386 fedora-22-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64
-  sudo: yes
-  sudo_user: copr-fe
+  become: yes
+  become_user: copr-fe
   args:
     chdir: /usr/share/copr/coprs_frontend/
 
 - name: set up admins
   command: ./manage.py alter_user --admin {{ item }}
-  sudo: yes
-  sudo_user: copr-fe
+  become: yes
+  become_user: copr-fe
   args:
     chdir: /usr/share/copr/coprs_frontend/
   ignore_errors: yes
diff --git a/roles/copr/frontend/tasks/psql_setup.yml b/roles/copr/frontend/tasks/psql_setup.yml
index 3b5b3f613c..138e221ea4 100644
--- a/roles/copr/frontend/tasks/psql_setup.yml
+++ b/roles/copr/frontend/tasks/psql_setup.yml
@@ -47,10 +47,10 @@
 
 - name: Create db
   postgresql_db: name="coprdb" encoding='UTF-8'
-  sudo: yes
-  sudo_user: postgres
+  become: yes
+  become_user: postgres
 
 - name: Create db user
   postgresql_user: db="coprdb" name="copr-fe" password="{{ copr_database_password }}" role_attr_flags=SUPERUSER,NOCREATEDB,NOCREATEROLE
-  sudo: yes
-  sudo_user: postgres
+  become: yes
+  become_user: postgres
diff --git a/roles/copr/keygen/tasks/main.yml b/roles/copr/keygen/tasks/main.yml
index d5de2b3845..6e5ae63727 100644
--- a/roles/copr/keygen/tasks/main.yml
+++ b/roles/copr/keygen/tasks/main.yml
@@ -43,7 +43,6 @@
   lineinfile: dest="/usr/lib/systemd/system/signd.service" line="[Install]"  state=present
 
 - name: ensure services are running
-  sudo: True
   service: name={{ item }} state=started enabled=yes
   with_items:
   - httpd
diff --git a/roles/dopr/tasks/psql_setup.yml b/roles/dopr/tasks/psql_setup.yml
index 9406453c42..05d9b3b113 100644
--- a/roles/dopr/tasks/psql_setup.yml
+++ b/roles/dopr/tasks/psql_setup.yml
@@ -37,10 +37,10 @@
 
 - name: Create db
   postgresql_db: name="cdicdb" encoding='UTF-8'
-  sudo: yes
-  sudo_user: postgres
+  become: yes
+  become_user: postgres
 
 - name: Create db user
   postgresql_user: db="cdicdb" name="cdic" password="{{ dopr_db_passwd }}" role_attr_flags=SUPERUSER,NOCREATEDB,NOCREATEROLE
-  sudo: yes
-  sudo_user: postgres
+  become: yes
+  become_user: postgres
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index ad9f1abdfc..642218e001 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -77,8 +77,8 @@
     repo: https://bitbucket.org/rajcze/openqa_fedora
     dest: /var/lib/openqa/share/tests/fedora
   register: gittests
-  sudo: true
-  sudo_user: geekotest
+  become: true
+  become_user: geekotest
 
 - name: Check out openqa_fedora_tools
   git:
@@ -131,15 +131,15 @@
 
 - name: Create database
   delegate_to: "{{ openqa_dbhost }}"
-  sudo_user: postgres
-  sudo: true
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   postgresql_user: db={{ openqa_dbname }} user={{ openqa_dbuser }} password={{ openqa_dbpassword }} role_attr_flags=NOSUPERUSER
   when: "openqa_dbhost is defined"
 
diff --git a/roles/taskotron/buildmaster-configure/tasks/main.yml b/roles/taskotron/buildmaster-configure/tasks/main.yml
index 328aa3ee31..ee7b84e3e4 100644
--- a/roles/taskotron/buildmaster-configure/tasks/main.yml
+++ b/roles/taskotron/buildmaster-configure/tasks/main.yml
@@ -1,16 +1,16 @@
 - name: create master
-  sudo: true
-  sudo_user: "{{ buildmaster_user }}"
+  become: true
+  become_user: "{{ buildmaster_user }}"
   command: creates={{ buildmaster_dir }} buildbot create-master -r {{ buildmaster_dir }}
 
 - name: upload master config
-  sudo: true
-  sudo_user: "{{ buildmaster_user }}"
+  become: true
+  become_user: "{{ buildmaster_user }}"
   template: src={{ buildmaster_template }} dest={{ buildmaster_dir }}/master.cfg owner={{ buildmaster_user }} group={{ buildmaster_user }}
 
 - name: check master config
-  sudo: true
-  sudo_user: "{{ buildmaster_user }}"
+  become: true
+  become_user: "{{ buildmaster_user }}"
   command: buildbot checkconfig {{ buildmaster_dir }}
 
 #- name: upgrade master
@@ -23,6 +23,6 @@
   service: name=buildmaster enabled=yes state=started
 
 - name: reconfig master
-  sudo: true
-  sudo_user: "{{ buildmaster_user }}"
+  become: true
+  become_user: "{{ buildmaster_user }}"
   command: buildbot reconfig {{ buildmaster_dir }}
diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml
index f082947c46..aabedb51f9 100644
--- a/roles/taskotron/buildmaster/tasks/main.yml
+++ b/roles/taskotron/buildmaster/tasks/main.yml
@@ -48,29 +48,29 @@
 - name: ensure buildmaster database is created
   when: buildmaster_db_host != 'localhost'
   delegate_to: "{{ buildmaster_db_host }}"
-  sudo: true
-  sudo_user: postgres
+  become: true
+  become_user: postgres
   postgresql_db: db={{ buildmaster_db_name }}
 
 - name: ensure dev db user has access to dev database
   when: deployment_type in ['dev', 'stg']
   delegate_to: "{{ buildmaster_db_host }}"
-  sudo: true
-  sudo_user: postgres
+  become: true
+  become_user: postgres
   postgresql_user: db={{ buildmaster_db_name }} user={{ buildmaster_db_user }} password={{ 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
+  become: true
+  become_user: postgres
   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
+  become: true
+  become_user: postgres
   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
diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml b/roles/taskotron/buildslave-configure/tasks/main.yml
index f9f406e8b3..3c23f189ab 100644
--- a/roles/taskotron/buildslave-configure/tasks/main.yml
+++ b/roles/taskotron/buildslave-configure/tasks/main.yml
@@ -1,19 +1,19 @@
 - name: create slave
-  sudo: true
-  sudo_user: "{{ slave_user }}"
+  become: true
+  become_user: "{{ slave_user }}"
   command: creates={{ slave_dir }} buildslave create-slave {{ slave_dir }} {{ buildmaster }} buildslave passwd
   when: deployment_type in ['local', 'qa-stg']
 
 - name: generate slave config
-  sudo: true
-  sudo_user: "{{ slave_user }}"
+  become: true
+  become_user: "{{ slave_user }}"
   template: src=buildbot.tac.j2 dest={{ slave_dir }}/buildbot.tac mode=0600 owner={{ slave_user }} group={{ slave_user }}
   when: deployment_type in ['local', 'qa-stg']
   #when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local'
 
 - name: generate slave info
-  sudo: true
-  sudo_user: "{{ slave_user }}"
+  become: true
+  become_user: "{{ slave_user }}"
   template: src={{ item }}.j2 dest={{ slave_dir }}/info/{{ item }} mode=0644 owner={{ slave_user }} group={{ slave_user }}
   with_items:
     - admin
@@ -47,32 +47,32 @@
 
 
 - name: create slave
-  sudo: true
-  sudo_user: '{{ item.user }}'
+  become: true
+  become_user: '{{ item.user }}'
   command: creates={{ item.dir }} buildslave create-slave {{ item.dir }} {{ buildmaster }} buildslave passwd
   with_items:
     - '{{ slaves|default([dict(user="", home="", dir="")]) }}'
   when: deployment_type in ['dev', 'stg', 'prod']
 
 - name: generate slave config
-  sudo: true
-  sudo_user: '{{ item.user }}'
+  become: true
+  become_user: '{{ item.user }}'
   template: src=buildbot.tac.j2 dest={{ item.dir }}/buildbot.tac mode=0600 owner={{ item.user }} group={{ slaves_group }}
   with_items:
     - '{{ slaves|default([dict(user="", home="", dir="")]) }}'
   when: deployment_type in ['dev', 'stg', 'prod']
 
 - name: generate slave admin info
-  sudo: true
-  sudo_user: '{{ item.user }}'
+  become: true
+  become_user: '{{ item.user }}'
   template: src=admin.j2 dest={{ item.dir }}/info/admin mode=0644 owner={{ item.user }} group={{ slaves_group }}
   with_items:
     - '{{ slaves|default([dict(user="", home="", dir="")]) }}'
   when: deployment_type in ['dev', 'stg', 'prod']
 
 - name: generate slave host info
-  sudo: true
-  sudo_user: '{{ item.user }}'
+  become: true
+  become_user: '{{ item.user }}'
   template: src=host.j2 dest={{ item.dir }}/info/host mode=0644 owner={{ item.user }} group={{ slaves_group }}
   with_items:
     - '{{ slaves|default([dict(user="", home="", dir="")]) }}'
diff --git a/roles/taskotron/execdb/tasks/main.yml b/roles/taskotron/execdb/tasks/main.yml
index eb9814b283..0301c03a7d 100644
--- a/roles/taskotron/execdb/tasks/main.yml
+++ b/roles/taskotron/execdb/tasks/main.yml
@@ -19,36 +19,36 @@
 
 - name: ensure database is created
   delegate_to: "{{ execdb_db_host_machine }}"
-  sudo_user: postgres
-  sudo: true
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
diff --git a/roles/taskotron/fake_fedorainfra/tasks/main.yml b/roles/taskotron/fake_fedorainfra/tasks/main.yml
index 94b272e4dc..9b7e6627be 100644
--- a/roles/taskotron/fake_fedorainfra/tasks/main.yml
+++ b/roles/taskotron/fake_fedorainfra/tasks/main.yml
@@ -14,29 +14,29 @@
 
 - name: ensure database is created
   delegate_to: "{{ buildmaster_db_host }}"
-  sudo: true
-  sudo_user: postgres
+  become: true
+  become_user: postgres
   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
+  become: true
+  become_user: postgres
   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
+  become: true
+  become_user: postgres
   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
+  become: true
+  become_user: postgres
   postgresql_user: db={{ fakefedorainfra_db_name }} user={{ local_fakefedorainfra_db_user }} password={{ local_fakefedorainfra_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: generate fakefedorainfra config
diff --git a/roles/taskotron/grokmirror/tasks/main.yml b/roles/taskotron/grokmirror/tasks/main.yml
index 07c92a1667..620999accc 100644
--- a/roles/taskotron/grokmirror/tasks/main.yml
+++ b/roles/taskotron/grokmirror/tasks/main.yml
@@ -33,14 +33,14 @@
 
 - name: clone initial git repos
   git: repo={{ item.url }} bare=yes dest={{ grokmirror_basedir }}/{{ item.name }} update=no
-  sudo: true
-  sudo_user: "{{ grokmirror_user }}"
+  become: true
+  become_user: "{{ grokmirror_user }}"
   with_items: grokmirror_repos
 
 - name: set up default branch
   command: chdir={{ grokmirror_basedir }}/{{ item.name }} git symbolic-ref HEAD refs/heads/{{ grokmirror_default_branch }}
-  sudo: true
-  sudo_user: "{{ grokmirror_user }}"
+  become: true
+  become_user: "{{ grokmirror_user }}"
   with_items: grokmirror_repos
 
 - name: generate grokmirror config
diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml
index 46e6ee5e62..b80690dc23 100644
--- a/roles/taskotron/resultsdb-backend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-backend/tasks/main.yml
@@ -19,29 +19,29 @@
 
 - name: ensure database is created
   delegate_to: "{{ resultsdb_db_host_machine }}"
-  sudo_user: postgres
-  sudo: true
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
diff --git a/roles/testdays/tasks/main.yml b/roles/testdays/tasks/main.yml
index b86ff5d70b..f092803342 100644
--- a/roles/testdays/tasks/main.yml
+++ b/roles/testdays/tasks/main.yml
@@ -9,14 +9,14 @@
 
 - name: ensure database is created
   delegate_to: "{{ testdays_db_host }}"
-  sudo_user: postgres
-  sudo: true
+  become_user: postgres
+  become: true
   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
+  become_user: postgres
+  become: true
   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
diff --git a/tasks/persistent_cloud.yml b/tasks/persistent_cloud.yml
index 9a74cd0abc..c4ae2f1035 100644
--- a/tasks/persistent_cloud.yml
+++ b/tasks/persistent_cloud.yml
@@ -22,7 +22,7 @@
   when: host_is_up|failed
 
 - name: spin UP VM using nova_compute
-  sudo: False
+  become: False
   local_action:
       module: nova_compute
       auth_url: "{{os_auth_url}}"
diff --git a/tasks/transient_cloud.yml b/tasks/transient_cloud.yml
index ddde57018d..59674e1833 100644
--- a/tasks/transient_cloud.yml
+++ b/tasks/transient_cloud.yml
@@ -1,7 +1,7 @@
 # New tasks to spin up instance in https://fedorainfracloud.org
 
 - name: spin UP VM using nova_compute
-  sudo: False
+  become: False
   local_action:
       security_groups: all-icmp-transient,web-80-anywhere-transient,web-443-anywhere-transient,ssh-anywhere-transient,default
       nics:
diff --git a/vars/global.yml b/vars/global.yml
index 0ae1722167..67991f6507 100644
--- a/vars/global.yml
+++ b/vars/global.yml
@@ -56,5 +56,5 @@ global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients',
 netapp_iscsi_name: iqn.1992-08.com.netapp:sn.8a2c2d9073de11e4a645123478563412:vs.13
 # iscsi portal for netapp iscsi volume
 netapp_iscsi_portal: 10.5.88.56
-# sudo: False by default so ansible doesn't try and check for it and hang
-sudo: False
+# become: False by default so ansible doesn't try and check for it and hang
+become: False