diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml
index e3b01cf..5b61584 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml
@@ -5,3 +5,8 @@
     generate_ssh_key: yes
     ssh_key_bits: 2048
     ssh_key_file: .ssh/id_rsa
+- name: Delete 'ubuntu' user
+  ansible.builtin.user:
+    name: ubuntu
+    state: absent
+    remove: yes
diff --git a/ansible/roles/os/tasks/main.yml b/ansible/roles/os/tasks/main.yml
index df16b58..d896e50 100644
--- a/ansible/roles/os/tasks/main.yml
+++ b/ansible/roles/os/tasks/main.yml
@@ -15,6 +15,3 @@
 
 - name: Install ansible
   import_tasks: ansible.yml
-
-- name: Delete temporary users
-  import_tasks: users.yml
diff --git a/ansible/roles/os/tasks/users.yml b/ansible/roles/os/tasks/users.yml
deleted file mode 100644
index 42cc699..0000000
--- a/ansible/roles/os/tasks/users.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: Delete 'ubuntu' user
-  ansible.builtin.user:
-    name: ubuntu
-    state: absent
-    remove: yes