diff --git a/ansible/roles/pre-configure/tasks/main.yml b/ansible/roles/pre-configure/tasks/main.yml
index 1118fa8aafa437f5a04e6292b403b2f68bbed3df..a3466176c9a1c1b10d6587e9655c18f1fe01151e 100644
--- a/ansible/roles/pre-configure/tasks/main.yml
+++ b/ansible/roles/pre-configure/tasks/main.yml
@@ -63,12 +63,13 @@
 
 - name: Workaround debian bug 2/3
   # kubectl needs to get installed as "classic" snap
-  command: mount --bind /dev/zero /sys/{{ kbd_device.stdout }}/uevent
-  args:
-    creates: /snap/bin/kubectl
-    # Circumvent the warning about using the Ansible mount module
-    warn: false
-  when: kbd_device.stdout != ""
+  mount:
+    opts: bind
+    src: /dev/zero
+    path: /sys/{{ kbd_device.stdout }}/uevent
+    fstype: none
+    state: mounted
+  when: kbd_device.stdout != "" and kbd_device.stdout != "skipped, since /snap/bin/kubectl exists"
 
 - name: Install kubectl snap
   # kubectl needs to get installed as "classic" snap
@@ -78,11 +79,10 @@
 
 - name: Workaround debian bug 3/3
   # kubectl needs to get installed as "classic" snap
-  command: umount /sys/{{ kbd_device.stdout }}/uevent
-  args:
-    creates: /snap/bin/kubectl
-    warn: false
-  when: kbd_device.stdout != ""
+  mount:
+    path: /sys/{{ kbd_device.stdout }}/uevent
+    state: unmounted
+  when: kbd_device.stdout != "" and kbd_device.stdout != "skipped, since /snap/bin/kubectl exists"
 
 - name: Create kubectl symlink to /usr/local/bin
   file: