diff --git a/.github/test_vars.yml b/.github/test_vars.yml
index 1d8a639..2e4efdd 100644
--- a/.github/test_vars.yml
+++ b/.github/test_vars.yml
@@ -1,3 +1,4 @@
 git_name: Testy McTestface
 git_email: testy@mctestface.com
 username: tester
+CI: true
diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml
index ca030e7..000c549 100644
--- a/.github/workflows/test_install.yml
+++ b/.github/workflows/test_install.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           cp ${GITHUB_WORKSPACE}/.github/test_vars.yml ${GITHUB_WORKSPACE}/.vars.yml
-          ansible-playbook -e in_container=true -i inventory workstation.yml 
+          ansible-playbook -i inventory workstation.yml 
       - name: check
         shell: bash -l {0}
         run: |
diff --git a/roles/docker-rootless/tasks/main.yml b/roles/docker-rootless/tasks/main.yml
index e30558d..2c876b3 100644
--- a/roles/docker-rootless/tasks/main.yml
+++ b/roles/docker-rootless/tasks/main.yml
@@ -24,7 +24,6 @@
 
 - name: Disable system docker
   ansible.builtin.shell: systemctl disable --now docker.service docker.socket
-  when: in_container is not defined
 
 - name: Find user UID
   ansible.builtin.command: 'id -u {{ username }}'
@@ -45,7 +44,6 @@
   ansible.builtin.shell: |
     dockerd-rootless-setuptool.sh install
     systemctl --user enable docker
-  when: in_container is not defined
 
 - name: Set environment variables
   become: yes
diff --git a/workstation.yml b/workstation.yml
index 5fc0134..f768ade 100644
--- a/workstation.yml
+++ b/workstation.yml
@@ -18,10 +18,10 @@
   - role: ./roles/pyenv
   - role: ./roles/git
   - role: ./roles/clamav
+
   - role: ./roles/xfce
-    when: in_container is not defined # needs X11
+    when: not CI  # needs X11
+
   - role: ./roles/docker-rootless
-    when: in_container is not defined # already running in a container
-  
-  
-  
+    when: not CI # already running in a container
+  
\ No newline at end of file