diff --git a/tasks/docker-rootless.yml b/tasks/docker-rootless.yml
index 227ae3d..553c467 100644
--- a/tasks/docker-rootless.yml
+++ b/tasks/docker-rootless.yml
@@ -26,12 +26,13 @@
 - name: Install rootless docker
   become: false
   command: /usr/bin/dockerd-rootless-setuptool.sh install
+  when: rootless_conf.stat.exists == false
 
 - name: Enable and start rootless docker
   become: false
   systemd:
-    name: docker
-    state: started
+    name: docker.service
+    state: restarted
     enabled: true
     scope: user
 
diff --git a/tasks/main.yml b/tasks/main.yml
index f85a3f5..c2b1c6d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -65,10 +65,15 @@
   when: docker_daemon_options.keys() | length > 0
   notify: restart docker
 
+- name: Stat for rootless docker
+  stat:
+    path: "{{ lookup('env', 'XDG_RUNTIME_DIR') }}/docker.sock"
+  register: rootless_conf
+
 - name: Uninstall rootless docker
   become: false
   command: /usr/bin/dockerd-rootless-setuptool.sh uninstall --force
-  when: docker_rootless == false
+  when: docker_rootless == false and rootless_conf.stat.exists
 
 - name: Ensure Docker is started and enabled at boot
   service: