diff --git a/roles/k3s_agent/tasks/http_proxy.yml b/roles/k3s_agent/tasks/http_proxy.yml
index f0a68f6..0b5a58c 100644
--- a/roles/k3s_agent/tasks/http_proxy.yml
+++ b/roles/k3s_agent/tasks/http_proxy.yml
@@ -1,18 +1,19 @@
 ---
+- name: Manage K3s HTTP Proxy Configuration
+  when: proxy_env is defined
+  block:
+    - name: Create k3s.service.d directory
+      ansible.builtin.file:
+        path: '{{ systemd_dir }}/k3s.service.d'
+        owner: root
+        group: root
+        state: directory
+        mode: '0755'
 
-- name: Create k3s.service.d directory
-  file:
-    path: '{{ systemd_dir }}/k3s.service.d'
-    state: directory
-    owner: root
-    group: root
-    mode: '0755'
-
-
-- name: Copy K3s http_proxy conf file
-  template:
-    src: "http_proxy.conf.j2"
-    dest: "{{ systemd_dir }}/k3s.service.d/http_proxy.conf"
-    owner: root
-    group: root
-    mode: '0755'
+    - name: Deploy the K3s http_proxy configuration file
+      ansible.builtin.template:
+        src: "http_proxy.conf.j2"
+        dest: "{{ systemd_dir }}/k3s.service.d/http_proxy.conf"
+        owner: root
+        group: root
+        mode: '0755'
diff --git a/roles/k3s_agent/tasks/main.yml b/roles/k3s_agent/tasks/main.yml
index ab2559a..3c81625 100644
--- a/roles/k3s_agent/tasks/main.yml
+++ b/roles/k3s_agent/tasks/main.yml
@@ -1,29 +1,32 @@
 ---
-- name: Check if system is PXE-booted
-  command: cat /proc/cmdline
-  register: boot_cmdline
-  changed_when: false
+- name: Check for PXE-booted system
+  block:
+    - name: Check if system is PXE-booted
+      ansible.builtin.command:
+        cmd: cat /proc/cmdline
+      register: boot_cmdline
+      changed_when: false
+      check_mode: false
 
-- name: Set fact for PXE-booted system
-  set_fact:
-    is_pxe_booted: "{{ 'root=/dev/nfs' in boot_cmdline.stdout }}"
-  when: boot_cmdline is defined
+    - name: Set fact for PXE-booted system
+      ansible.builtin.set_fact:
+        is_pxe_booted: "{{ 'root=/dev/nfs' in boot_cmdline.stdout }}"
+      when: boot_cmdline.stdout is defined
 
-- name: Deploy K3s http_proxy conf
-  include_tasks: http_proxy.yml
-  when: proxy_env is defined
+    - name: Include http_proxy configuration tasks
+      ansible.builtin.include_tasks: http_proxy.yml
 
-- name: Copy K3s service file
-  template:
+- name: Configure the k3s service
+  ansible.builtin.template:
     src: "k3s.service.j2"
     dest: "{{ systemd_dir }}/k3s-node.service"
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
 
-- name: Enable and check K3s service
-  systemd:
+- name: Manage k3s service
+  ansible.builtin.systemd:
     name: k3s-node
-    daemon_reload: yes
+    daemon_reload: true
     state: restarted
-    enabled: yes
+    enabled: true