diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 39321a8..a926707 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -8,14 +8,14 @@
       msg: Debug
   # basics
   - import_tasks: system_setup/hostname.yml
-  - include_tasks: system_setup/hosts.yml
+  - import_tasks: system_setup/hosts.yml
   - import_tasks: system_setup/clock.yml
   - import_tasks: system_setup/locale.yml
-  - include_tasks: system_setup/wireguard.yml
+  - import_tasks: system_setup/wireguard.yml
     when:
       - wireguard is defined
       - wireguard == true
-      - ansible_default_ipv4.address | ipaddr('public')
+      - ansible_default_ipv4.address | ansible.utils.ipaddr('public')
     ignore_errors: True
   - import_tasks: system_setup/git.yml
   # install software