diff --git a/defaults/main.yml b/defaults/main.yml
index d0fb146..f4e02d2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -109,4 +109,4 @@ systemd_networkd_network: []
 #       value: "192.168.178.100"
 #   filename: "50-wireguard.network"
 
-systemd_timesyncd_timezone: Europe/Berlin
\ No newline at end of file
+systemd_timesyncd_timezone: Europe/Berlin
diff --git a/handlers/main.yml b/handlers/main.yml
index 25ee114..566db16 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: restart networkd
-  systemd:
+  ansible.builtin.systemd:
     name: "{{ item }}"
     state: restarted
     daemon_reload: true
diff --git a/meta/main.yml b/meta/main.yml
index 420e04d..81b8692 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -16,9 +16,9 @@ galaxy_info:
     versions:
     - "35"
 
-  galaxy_tags:
-  - systemd-networkd
-  - wiregurd
-  - resolvectl
+  # galaxy_tags:
+  # - systemd-networkd
+  # - wiregurd
+  # - resolvectl
 
 dependencies: []
diff --git a/tasks/main.yml b/tasks/main.yml
index 5144e1d..1d2d17f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
 
 - name: Include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
 - name: "Remove existing systemd-networkd configuration"
-  file:
+  ansible.builtin.file:
     path: "/etc/systemd/network"
     state: absent
 
 - name: "Create systemd-networkd directory"
-  file:
+  ansible.builtin.file:
     path: "/etc/systemd/network"
     owner: root
     group: root
@@ -19,7 +19,7 @@
 - name: Create systemd.netdev files
   block:
   - name: Create systemd.netdev files
-    template:
+    ansible.builtin.template:
       src: systemd.netdev.j2
       dest: "/etc/systemd/network/{{ item.filename }}"
       owner: "{{ systemd_networkd_unix_user }}"
@@ -31,7 +31,7 @@
     with_items: "{{ systemd_networkd_netdev }}"
 
   - name: Create sensitive systemd.netdev files
-    template:
+    ansible.builtin.template:
       src: systemd.netdev.j2
       dest: "/etc/systemd/network/{{ item.filename }}"
       owner: "{{ systemd_networkd_unix_user }}"
@@ -45,7 +45,7 @@
     notify: restart networkd
 
 - name: Create systemd.networkd files
-  template:
+  ansible.builtin.tempansible.builtin.file:
     src: systemd.network.j2
     dest: "/etc/systemd/network/{{ item.filename }}"
     owner: "{{ systemd_networkd_unix_user }}"
@@ -55,36 +55,36 @@
   notify: restart networkd
 
 - name: Create symlink to use systemd-resolved's stub-listener
-  file:
+  ansible.builtin.file:
     src: /run/systemd/resolve/stub-resolv.conf
     dest: /etc/resolv.conf
     state: link
-    force: yes
-    follow: no
+    force: true
+    follow: false
     owner: root
     group: root
 
 - name: Start and enable systemd-networkd
-  service:
+  ansible.builtin.systemd:
     name: systemd-networkd
     state: started
-    enabled: yes
-    daemon_reload: yes
+    enabled: true
+    daemon_reload: true
 
 - name: Start and enable systemd-resolved
-  service:
+  ansible.builtin.systemd:
     name: systemd-resolved
     state: started
-    enabled: yes
-    daemon_reload: yes
+    enabled: true
+    daemon_reload: true
 
 - name: Set system timezone
-  timezone:
+  community.general.timezone:
     name: "{{ systemd_timesyncd_timezone }}"
 
 - name: Start and enable systemd-timesyncd
-  service:
+  ansible.builtin.systemd:
     name: systemd-timesyncd
     state: started
-    enabled: yes
-    daemon_reload: yes
+    enabled: true
+    daemon_reload: true
diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml
index dbc81ee..fd7601d 100644
--- a/vars/Archlinux.yml
+++ b/vars/Archlinux.yml
@@ -1,4 +1,4 @@
 ---
 
 systemd_networkd_unix_user: systemd-network
-systemd_networkd_unix_group: systemd-network
\ No newline at end of file
+systemd_networkd_unix_group: systemd-network
diff --git a/vars/Debian.yml b/vars/Debian.yml
index dbc81ee..fd7601d 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,4 +1,4 @@
 ---
 
 systemd_networkd_unix_user: systemd-network
-systemd_networkd_unix_group: systemd-network
\ No newline at end of file
+systemd_networkd_unix_group: systemd-network
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 2a17aca..2dec395 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -3,4 +3,4 @@
 systemd_networkd_unix_user: systemd-network
 systemd_networkd_unix_group: systemd-network
 
-systemd_networkd_package_names: []
\ No newline at end of file
+systemd_networkd_package_names: []