diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml b/collections/ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml
index 3d372ef..45a434e 100644
--- a/collections/ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml
+++ b/collections/ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 workstation_user_account: "{{ custom_base_user_account }}"
 workstation_github_token: "{{ custom_github_token | default('') }}"
+workstation_setup_xorg_enabled: false
diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml b/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml
index f322ef5..6018015 100644
--- a/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml
+++ b/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml
@@ -142,6 +142,7 @@
 
 - name: '[home] copy X related configuration'
   become: true
+  when: workstation_setup_xorg_enabled  is truthy
   block:
     - name: '[x11] xorg.conf'
       ansible.builtin.copy: