diff --git a/tasks/main.yaml b/tasks/main.yaml
index 21b973b..e0e7f41 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -95,7 +95,7 @@
 
 # service
 - name: "service"
-  ansible.builtin.import_tasks: "service.yaml"
+  ansible.builtin.include_tasks: "service.yaml"
   loop: "{{ service }}"
   loop_control:
     loop_var: "__service"
@@ -145,9 +145,6 @@
 # sysctl
 - name: "sysctl - set sysctl"
   ansible.builtin.import_tasks: "sysctl.yaml"
-  loop: "{{ sysctl }}"
-  loop_control:
-    loop_var: "__sysctl"
   when: 'type == "vm" or type == "hw"'
   tags: "sysctl"
 
@@ -203,11 +200,11 @@
 
 # user
 - name: "user - create users"
-  ansible.builtin.import_tasks: "user.yaml"
-  tags: "usermanagement"
+  ansible.builtin.include_tasks: "user.yaml"
   loop: "{{ users }}"
   loop_control:
     loop_var: "__user"
+  tags: "usermanagement"
 
 # firewall
 - name: "firewall"
diff --git a/tasks/sysctl.yaml b/tasks/sysctl.yaml
index d856592..6ab2f2b 100644
--- a/tasks/sysctl.yaml
+++ b/tasks/sysctl.yaml
@@ -6,4 +6,7 @@
     name: "{{ __sysctl['name'] }}"
     value: "{{ __sysctl['value'] }}"
     sysctl_set: true
+  loop: "{{ sysctl }}"
+  loop_control:
+    loop_var: "__sysctl"
   tags: "sysctl"
diff --git a/tasks/user.yaml b/tasks/user.yaml
index eba191b..ec1d51f 100644
--- a/tasks/user.yaml
+++ b/tasks/user.yaml
@@ -2,7 +2,6 @@
 
 # manage users
 - name: "manage users"
-  tags: "usermanagement"
   block:
 
     # manage facts