diff --git a/tasks/dyndns.yml b/tasks/dyndns.yml
index 19ad19c..2c45b7e 100644
--- a/tasks/dyndns.yml
+++ b/tasks/dyndns.yml
@@ -66,6 +66,8 @@
         group: apache
         mode: ug=rw,o=r
 - name: Create DynDNS zones
+  tags:
+    - users
   block:
     - name: Create DynDNS zones
       when: public_dns == "yes"
@@ -88,8 +90,6 @@
         loop_var: user
       register: create_dns_zones
       changed_when: create_dns_zones.rc == 0
-  tags:
-    - users
 - name: Make sure DynDNS zones are master zones
   when: public_dns == "yes"
   ansible.builtin.command: "pdnsutil set-kind {{ user.name }}.dyndns.{{ mailserver_domain }} primary"
diff --git a/tasks/kolab.yml b/tasks/kolab.yml
index 6af03ce..dfeaff2 100644
--- a/tasks/kolab.yml
+++ b/tasks/kolab.yml
@@ -516,6 +516,8 @@
     loop_var: kolab_service
 - name: Add Kolab users
   no_log: true
+  tags:
+    - users
   block:
     - name: "Add user to Kolab: {{ user.name }}"
       ansible.builtin.include_tasks: add_kolab_user.yml
@@ -530,5 +532,3 @@
       loop: "{{ users }}"
       loop_control:
         loop_var: user
-  tags:
-    - users