diff --git a/roles/network/handlers/main.yml b/roles/network/handlers/main.yml
index b38da59..da901a6 100644
--- a/roles/network/handlers/main.yml
+++ b/roles/network/handlers/main.yml
@@ -1,14 +1,18 @@
 ---
-- block:
-  - name: restart network
-    command: /bin/sh /etc/netstart
-  when: ansible_os_family == "OpenBSD"
+- name: Restart network
+  ansible.builtin.command:
+    argv:
+      - /bin/sh
+      - /etc/netstart
+  
+- name: Reload network manager connections
+  ansible.builtin.command:
+    argv:
+      - nmcli
+      - c
+      - reload
 
-- block:
-  - name: reload network manager connections
-    command: nmcli c reload
-  - name: restart keepalived
-    service:
-      name: keepalived
-      state: restarted
-  when: ansible_os_family == "RedHat"
+- name: Restart keepalived
+  ansible.builtin.service:
+    name: keepalived
+    state: restarted
diff --git a/roles/network/tasks/OpenBSD.yml b/roles/network/tasks/OpenBSD.yml
index df64693..5e94cf0 100644
--- a/roles/network/tasks/OpenBSD.yml
+++ b/roles/network/tasks/OpenBSD.yml
@@ -1,39 +1,41 @@
 ---
-
-- name: create ethernet interface configurations
-  template:
+- name: Create ethernet interface configurations
+  ansible.builtin.template:
     src: hostname.if.j2
     dest: "/etc/hostname.{{ item.device }}"
     mode: 0600
     owner: root
     group: "{{ ansible_wheel }}"
   with_items: "{{ network_interfaces }}"
-  notify: restart network
+  notify: Restart network
 
-- block:
-    - name: create carp interface configurations
-      template:
-        src: hostname.carp.j2
-        dest: "/etc/hostname.carp{{ item.vhid }}"
-        mode: 0600
-        owner: root
-        group: "{{ ansible_wheel }}"
-      with_items: "{{ network_vip_interfaces }}"
-      notify: restart network
-    - name: enable carp preempt
-      sysctl:
-        name: net.inet.carp.preempt
-        value: "1"
+- name: Create carp interface configurations
+  ansible.builtin.template:
+    src: hostname.carp.j2
+    dest: "/etc/hostname.carp{{ item.vhid }}"
+    mode: 0600
+    owner: root
+    group: "{{ ansible_wheel }}"
+  with_items: "{{ network_vip_interfaces }}"
+  notify: Restart network
   when:
     - network_vip_interfaces is defined
     - network_vip_interfaces != []
 
-- name: set default gateway
-  copy:
+- name: Enable CARP preempt
+  ansible.posix.sysctl:
+    name: net.inet.carp.preempt
+    value: "1"
+  when:
+    - network_vip_interfaces is defined
+    - network_vip_interfaces != []
+
+- name: Set default gateway
+  ansible.buitin.copy:
     content: "{{ network_default_gateway }}\n"
     dest: /etc/mygate
     mode: 0600
     owner: root
     group: "{{ ansible_wheel }}"
-  notify: restart network
+  notify: Restart network
   when: network_default_gateway is defined
diff --git a/roles/network/tasks/RedHat.yml b/roles/network/tasks/RedHat.yml
index 93a9c07..19b71da 100644
--- a/roles/network/tasks/RedHat.yml
+++ b/roles/network/tasks/RedHat.yml
@@ -1,39 +1,51 @@
 ---
-- name: get interface uuid
-  command:
-    cmd: nmcli -f "DEVICE,UUID,NAME" c show
+- name: Get interface uuid
+  ansible.builtin.command:
+    argv:
+      - nmcli
+      - -f
+      - DEVICE,UUID,NAME
+      - c
+      - show
   changed_when: false
   check_mode: false
   register: interface_uuid
 
-- name: create ethernet interface configurations
-  template:
+- name: Create ethernet interface configurations
+  ansible.builtin.template:
     src: ifcfg-eth.j2
     dest: "/etc/sysconfig/network-scripts/ifcfg-{{ item.device }}"
     mode: 0644
     owner: root
     group: "{{ ansible_wheel }}"
-  notify: reload network manager connections
+  notify: Reload network manager connections
   with_items: "{{ network_interfaces }}"
 
-- block:
-    - name: install keepalived
-      package:
-        name: keepalived
-        state: installed
-    - name: create keepalived config
-      template:
-        dest: /etc/keepalived/keepalived.conf
-        src: keepalived.conf.j2
-        mode: 0600
-        owner: root
-        group: "{{ ansible_wheel }}"
-      notify: restart keepalived
-    - name: enable keepalived
-      service:
-        name: keepalived
-        state: started
-        enabled: true
+- name: Install keepalived
+  ansible.builtin.package:
+    name: keepalived
+    state: installed
+  when:
+    - network_vip_interfaces is defined
+    - network_vip_interfaces != []
+
+- name: Create keepalived config
+  ansible.builtin.template:
+    dest: /etc/keepalived/keepalived.conf
+    src: keepalived.conf.j2
+    mode: 0600
+    owner: root
+    group: "{{ ansible_wheel }}"
+  notify: Restart keepalived
+  when:
+    - network_vip_interfaces is defined
+    - network_vip_interfaces != []
+
+- name: Enable keepalived
+  ansible.builtin.service:
+    name: keepalived
+    state: started
+    enabled: true
   when:
     - network_vip_interfaces is defined
     - network_vip_interfaces != []
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 1812829..6f9d8b6 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
-- name: include os spcific tasks
-  include_tasks: "{{ ansible_os_family }}.yml"
+- name: Include OS spcific tasks
+  ansible.builtin.include_tasks: "{{ ansible_os_family }}.yml"
 
-- name: create resolv.conf
-  template:
+- name: Create resolv.conf
+  ansible.builtin.template:
     src: resolv.conf.j2
     dest: /etc/resolv.conf
     mode: 0644