diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d8b9417..f994d98f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ The **patch** part changes incrementally at each release.
 
 ### Changed
 
-* Use 'loop' syntax instead of 'with_first_found/with_items'
+* Use 'loop' syntax instead of 'with_first_found/with_items/with_dict'
 * apt: store keys in /etc/apt/trusted.gpg.d in ascii format
 * evolinux-base: copy GPG key instead of using apt-key
 * ntpd: Add leapfile configuration setting to ntpd on debian 10+
diff --git a/evolinux-users/tasks/main.yml b/evolinux-users/tasks/main.yml
index b3be0c8d..20cdf040 100644
--- a/evolinux-users/tasks/main.yml
+++ b/evolinux-users/tasks/main.yml
@@ -15,14 +15,14 @@
   include: user.yml
   vars:
     user: "{{ item.value }}"
-  with_dict: "{{ evolinux_users }}"
+  loop: "{{ evolinux_users | dict2items }}"
   when: evolinux_users != {}
 
 - name: Configure sudo
   include: sudo.yml
   vars:
     user: "{{ item.value }}"
-  with_dict: "{{ evolinux_users }}"
+  loop: "{{ evolinux_users | dict2items }}"
   when: evolinux_users != {}
 
 - name: Configure SSH
diff --git a/evolinux-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml
index e21f0978..06a05b89 100644
--- a/evolinux-users/tasks/ssh.yml
+++ b/evolinux-users/tasks/ssh.yml
@@ -48,7 +48,7 @@
 - include: ssh_allowusers.yml
   vars:
     user: "{{ item.value }}"
-  with_dict: "{{ evolinux_users }}"
+  loop: "{{ evolinux_users | dict2items }}"
   when:
     - ssh_allowusers
     - not ssh_allowgroups