diff --git a/roles/gpu/tasks/main.yml b/roles/gpu/tasks/main.yml
index 7b156acb9093711eadf0791c226fd0ca2534b41a..c6848ff4afb1221454ca3641ddf488f81bf2592c 100644
--- a/roles/gpu/tasks/main.yml
+++ b/roles/gpu/tasks/main.yml
@@ -25,7 +25,8 @@
       - xorg-x11-xauth
       - xorg-x11-proto-devel
       - xorg-x11-xkb-utils
-    become: true
+      - python-jinja2
+  become: true
   when: ansible_os_family == 'RedHat'
 
 - name: install deps
@@ -215,14 +216,14 @@
 #  become_user: root
 #  when: template_xorgconf is defined and template_xorgcon
 - name: install dependencies for nvidia-xconf-gen
-  apt:
+  package:
    name:
     - python-jinja2
     - python3-jinja2
-   update_cache: yes
    state: present
   become: true
   become_user: root
+  when: ansible_distribution == 'Ubuntu'
 
 - name: run nvidia-xconf-gen
   script: scripts/nvidia-xconf-gen.py
diff --git a/roles/nfs-client/handlers/main.yml b/roles/nfs-client/handlers/main.yml
index b05f9fbf8929597fb98eca15a29a52f843b32e65..8440d7e651278e9872b5e881535483049554f7db 100644
--- a/roles/nfs-client/handlers/main.yml
+++ b/roles/nfs-client/handlers/main.yml
@@ -3,7 +3,7 @@
   service: name=rpcbind state=restarted
   become: true
 
-- name: restart idmap 
+- name: restart idmap
   service: name=rpcidmapd state=restarted
   become: true
   when: ansible_os_family == "RedHat" and ansible_distribution_major_version < 7
diff --git a/roles/nfs-client/tasks/main.yml b/roles/nfs-client/tasks/main.yml
index 23ac6d08e10c0927ac3c680bc9a2a349771d01fe..084f3fb7c4df79fa30e613952fd3ab4a7bc04125 100644
--- a/roles/nfs-client/tasks/main.yml
+++ b/roles/nfs-client/tasks/main.yml
@@ -1,18 +1,17 @@
 ---
 - name: install dependencies
-  yum: name={{ item }} state=installed
+  package:
+    state: present
+    name:
+      - libnfsidmap
+      - nfs-utils
+      - nfstest.noarch
   become: true
-  with_items:
-    - libnfsidmap 
-    - nfs-utils
-    - nfstest.noarch
   when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "7"
 
 - name: install dependencies
-  yum: name={{ item }} state=installed
+  yum: name=nfs-utils-lib state=installed
   become: true
-  with_items:
-    - nfs-utils-lib
   when: ansible_os_family == "RedHat" and ansible_distribution_major_version < "7"
 
 - name: install dependencies nfs-common ubuntu
diff --git a/roles/nfs-client/tasks/mountFileSystem.yml b/roles/nfs-client/tasks/mountFileSystem.yml
index 41ecd052629ed1de9acd3d1953bde2836a7a2cbe..c36db919646c24bb6877b9540d8fc27723bb3cbf 100644
--- a/roles/nfs-client/tasks/mountFileSystem.yml
+++ b/roles/nfs-client/tasks/mountFileSystem.yml
@@ -1,9 +1,8 @@
---- 
-
+---
 - name: "Mounting NFS mounts"
   mount: name={{ item.name }} src="{{ item.ipv4 }}:{{ item.src }}" fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
   with_items: "{{ nfsMounts }}"
-  become: true 
+  become: true
   ignore_errors: false
   register: firstMount
   when: nfsMounts is defined
diff --git a/roles/nfs-common/handlers/main.yml b/roles/nfs-common/handlers/main.yml
index f5c928114ee92484c0bb856b936476fbddfb5324..6cdc4ec5ef9648fb49b04622b2d2a9fd57b9279b 100644
--- a/roles/nfs-common/handlers/main.yml
+++ b/roles/nfs-common/handlers/main.yml
@@ -1,4 +1,3 @@
---- 
-- 
-  name: "Run rpcbind service"
+---
+- name: "Run rpcbind service"
   service: "name=rpcbind state=started enabled=yes"
diff --git a/roles/nfs-common/tasks/aptPackages.yml b/roles/nfs-common/tasks/aptPackages.yml
index 5324005b6cad3b3f896c97320cb2d129ae0f3552..d366a7b5b4aa1ed550beadca3f872e7bdd6af996 100644
--- a/roles/nfs-common/tasks/aptPackages.yml
+++ b/roles/nfs-common/tasks/aptPackages.yml
@@ -1,8 +1,8 @@
 ---
-- 
-  name: "Install nfs-utils"
-  with_items:
-    - nfs-common
-    - nfs-kernel-server
-  apt: "name={{ item }} state=present"
+- name: "Install nfs-utils"
+  package:
+    state: present
+    name:
+      - nfs-common
+      - nfs-kernel-server
   become: true
diff --git a/roles/nfs-common/tasks/yumPackages.yml b/roles/nfs-common/tasks/yumPackages.yml
index 6a8fd12b59d258f9ad021653350345729ffcb2e2..70cb727d19045168e20a58a12b0560b7efe8a005 100644
--- a/roles/nfs-common/tasks/yumPackages.yml
+++ b/roles/nfs-common/tasks/yumPackages.yml
@@ -1,8 +1,8 @@
---- 
-- 
-  name: "Install nfs-utils"
-  with_items: 
-    - bind-utils
-    - nfs-utils
-  yum: "name={{ item }} state=present"
+---
+- name: "Install nfs-utils"
+  package:
+    name:
+      - bind-utils
+      - nfs-utils
+    state: present
   become: true
diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml
index 6b914fd4189e3ab3f1812e05b8a0511994ed1c69..1e53779ccd9d716cdaa1bce1b6d822c954659748 100644
--- a/roles/slurm-common/tasks/main.yml
+++ b/roles/slurm-common/tasks/main.yml
@@ -40,21 +40,22 @@
   when: ansible_os_family == "RedHat"
 
 - name: install deps
-  apt: name={{ item }} state=installed update_cache=yes
-  become: true
-  with_items:
-    - gcc
-    - wget
-    - libssl-dev # downgrade needed for bionic see https://github.com/dun/munge/issues/54
-    - libpam0g-dev
-    - libbz2-dev
-    - make
-    - perl
-    - libdbi-perl
-    - lua5.2
-    - liblua5.2-dev
-    - hwloc
-    - libhwloc-dev
+  package: 
+    state: present
+    name:
+      - gcc
+      - wget
+      - libssl-dev # downgrade needed for bionic see https://github.com/dun/munge/issues/54
+      - libpam0g-dev
+      - libbz2-dev
+      - make
+      - perl
+      - libdbi-perl
+      - lua5.2
+      - liblua5.2-dev
+      - hwloc
+      - libhwloc-dev
+  become: true
   when: ansible_os_family == "Debian"
 
 - include: installMungeFromSource.yml
diff --git a/roles/slurmdb-config/tasks/main.yml b/roles/slurmdb-config/tasks/main.yml
index 4d6e38457d965add6844c8ea507911ffcd288679..f9d489d2133658ab89a3c36759355dfdbfc8d8ef 100644
--- a/roles/slurmdb-config/tasks/main.yml
+++ b/roles/slurmdb-config/tasks/main.yml
@@ -6,7 +6,7 @@
       - mysql
       - mysql-devel
       - MySQL-python
-    become: true
+  become: true
   when: ansible_os_family == "RedHat"
 
 - name: install deps in control node