diff --git a/roles/gpu/tasks/main.yml b/roles/gpu/tasks/main.yml
index 96425d40b43dffc3b055f0c4b3479a6f1ec3bab1..7b156acb9093711eadf0791c226fd0ca2534b41a 100644
--- a/roles/gpu/tasks/main.yml
+++ b/roles/gpu/tasks/main.yml
@@ -1,35 +1,36 @@
 ---
-- name: install deps 
-  yum: name={{ item }} state=installed
-  become: true
-  with_items:
-    - gcc
-    - perl
-    - wget
-    - pciutils
-    - kernel-headers
-    - kernel-devel 
-    - xterm
-    - libX11-common
-    - libX11-devel
-    - libX11
-    - libglvnd-devel
-    - xorg-x11-server-common
-    - xorg-x11-util-macros
-    - xorg-x11-server-utils
-    - xorg-x11-font-utils
-    - xorg-x11-server-Xorg
-    - xorg-x11-glamor
-    - xorg-x11-xinit
-    - xorg-x11-utils
-    - xorg-x11-xauth
-    - xorg-x11-proto-devel
-    - xorg-x11-xkb-utils
+- name: install deps
+  package:
+    state: present
+    name:
+      - gcc
+      - perl
+      - wget
+      - pciutils
+      - kernel-headers
+      - kernel-devel
+      - xterm
+      - libX11-common
+      - libX11-devel
+      - libX11
+      - libglvnd-devel
+      - xorg-x11-server-common
+      - xorg-x11-util-macros
+      - xorg-x11-server-utils
+      - xorg-x11-font-utils
+      - xorg-x11-server-Xorg
+      - xorg-x11-glamor
+      - xorg-x11-xinit
+      - xorg-x11-utils
+      - xorg-x11-xauth
+      - xorg-x11-proto-devel
+      - xorg-x11-xkb-utils
+    become: true
   when: ansible_os_family == 'RedHat'
 
-- name: install deps 
-  apt: 
-    name: 
+- name: install deps
+  apt:
+    name:
      - 'gcc'
      - 'perl'
      - 'wget'
@@ -47,7 +48,7 @@
   become_user: root
   when: ansible_distribution == 'Ubuntu'
 
-- name: install deps 
+- name: install deps
   yum: name={{ item }} state=installed
   become: true
   with_items:
@@ -56,7 +57,7 @@
     - wget
     - pciutils
     - kernel-headers
-    - kernel-devel 
+    - kernel-devel
     - xterm
     - libX11-common
     - libX11-devel
@@ -100,7 +101,7 @@
 
 - name: remove nouveau
   modprobe: name=nouveau state=absent
-  become: true 
+  become: true
   become_user: root
 
 - name: get kernel version
@@ -116,7 +117,7 @@
   ignore_errors: true
 
 - name: set default driver version
-  set_fact: 
+  set_fact:
     installed_driver_version: '0.0'
 
 - name: check nvidia driver version
@@ -127,20 +128,20 @@
   changed_when: False
 
 - name: set install default
-  set_fact: 
+  set_fact:
     install_driver: false
 
 - name: set uninstall default
-  set_fact: 
+  set_fact:
     uninstall_driver: false
 
 - name: set install
-  set_fact: 
+  set_fact:
     install_driver: true
   when: not nvidia_driver.stat.exists or not installed_driver_version.stdout == nvidia_version
 
 - name: set uninstall
-  set_fact: 
+  set_fact:
     uninstall_driver: true
   when: nvidia_driver.stat.exists and not installed_driver_version.stdout == nvidia_version
 
@@ -161,18 +162,18 @@
   become_user: root
   when: uninstall_driver
 
-- name: get nvidia driver 
+- name: get nvidia driver
   get_url: url=http://consistency0/src/NVIDIA-Linux-x86_64-{{ nvidia_version }}.run dest=/tmp/NVIDIA-Linux-x86_64-{{ nvidia_version }}.run
   become: true
   become_user: root
   when: install_driver
 
 #- name: Copy boot file
-#  template: src=grub.conf.j2 dest=/boot/grub/grub.conf 
+#  template: src=grub.conf.j2 dest=/boot/grub/grub.conf
 #  become: true
 #
 #- name: Copy X config file
-#  template: src=xorg.conf.j2 dest=/etc/X11/xorg.conf 
+#  template: src=xorg.conf.j2 dest=/etc/X11/xorg.conf
 #  become: true
 
 - name: Copy xserver file
@@ -205,7 +206,7 @@
   shell: /usr/bin/nvidia-xconfig -a --use-display-device=none --preserve-busid
   become: true
   become_user: root
-  args: 
+  args:
     creates: /etc/X11/xorg.conf
 
 #- name: Template xorg.conf for nodes with one GPU
@@ -230,7 +231,7 @@
   changed_when: False
 
 - name: set env for nvidia_card_lists
-  set_fact: 
+  set_fact:
     nvidiacardslist: "{{ nvidiacards.stdout | from_json }}"
 
 - name: generate nvidia-xorg-conf