diff --git a/plays/services/main.yml b/plays/services/main.yml
index 5502e02..37289cc 100644
--- a/plays/services/main.yml
+++ b/plays/services/main.yml
@@ -3,20 +3,18 @@
   hosts: "zfs"
   tasks:
     - name: "datasets_system"
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: "datasets_system"
-        apply:
-          tags: "services:datasets_system"
-      tags: "always"
+      tags: "services:datasets_system"
 
     - name: "datasets_user"
       ansible.builtin.include_role:
         name: "datasets_user"
         apply:
           tags:
+            - "services:{{ services_service_name }}"
             - "services:datasets_user"
             - "services:datasets_user:{{ services_service_name }}"
-            - "services:{{ services_service_name }}"
             - "services:{{ services_service_name }}:datasets_user"
       loop: "{{ services_host_services | dict2items | map(attribute='key') }}"
       loop_control:
@@ -35,9 +33,9 @@
         name: "setup_user"
         apply:
           tags:
+            - "services:{{ services_service_name }}"
             - "services:setup_user"
             - "services:setup_user:{{ services_service_name }}"
-            - "services:{{ services_service_name }}"
             - "services:{{ services_service_name }}:setup_user"
       loop: "{{ services_host_services | dict2items | map(attribute='key') }}"
       loop_control: