diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 09229d9..a1f1d05 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -42,7 +42,7 @@
   when: deployment_public_ssh_key is defined
   become: true
   block:
-    - name: Add user to docker group
+    - name: Add deployment user to docker group
       ansible.builtin.user:
         name: deployment
         groups: docker
@@ -65,7 +65,7 @@
         state: present
         gid: 9999
 
-    - name: Create user
+    - name: Create appuser
       ansible.builtin.user:
         name: appuser
         state: present
diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml
index 2d58ad4..e416529 100644
--- a/roles/users/tasks/main.yml
+++ b/roles/users/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: Set up primary sysadmin user
-  when: deployment_public_ssh_key is defined
+  when: sysadmin_public_ssh_key is defined
   become: true
   block:
-    - name: Create user
+    - name: Create sysadmin user
       ansible.builtin.user:
         name: "{{ sysadmin_user }}"
         groups: sudo
@@ -29,7 +29,7 @@
   when: deployment_public_ssh_key is defined
   become: true
   block:
-    - name: Create user
+    - name: Create deployment user
       ansible.builtin.user:
         name: deployment
         shell: /bin/bash