diff --git a/roles/gpu/tasks/main.yml b/roles/gpu/tasks/main.yml
index b35c8890d9dddcf4c555a50cf8ceff45f0add157..3e5683bba7955facf50c7b29b27742f821e93d3e 100644
--- a/roles/gpu/tasks/main.yml
+++ b/roles/gpu/tasks/main.yml
@@ -45,11 +45,6 @@
   become: true
   become_user: root
 
-- name: enable persistenced on boot
-  service: name=nvidia-persistenced state=started enabled=yes
-  become: true
-  become_user: root
-
 
 - name: remove nouveau
   modprobe: name=nouveau state=absent
@@ -88,3 +83,15 @@
   shell: nvidia-smi --gom=0
   become: true
   become_user: root
+
+- name: enable persistenced on boot
+  service: name=nvidia-persistenced state=started enabled=yes
+  become: true
+  become_user: root
+
+- name: Configure xorg.conf with nvidia-xconfig so xorg.conf matches gpu number
+  shell: /usr/bin/nvidia-xconfig -a --use-display-device=none
+  become: true
+  become_user: root
+  args: 
+    creates: /etc/X11/xorg.conf