diff --git a/roles/k3s_agent/defaults/main.yml b/roles/k3s_agent/defaults/main.yml
index 037c1f3..bdf76ae 100644
--- a/roles/k3s_agent/defaults/main.yml
+++ b/roles/k3s_agent/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
-is_pxe_booted: false
 extra_agent_args: ""
 group_name_master: master
 systemd_dir: /etc/systemd/system
diff --git a/roles/k3s_agent/meta/main.yml b/roles/k3s_agent/meta/main.yml
index a2f694c..04f856a 100644
--- a/roles/k3s_agent/meta/main.yml
+++ b/roles/k3s_agent/meta/main.yml
@@ -8,21 +8,26 @@ argument_specs:
         required: true
 
       extra_agent_args:
-        description: Virtual ip-address configured on each master
-        default: Arguments passed to the systemd service
+        description: Extra arguments for agents nodes
 
       group_name_master:
         description: Name of the master group
         default: master
 
+      k3s_token:
+        description: Token used to communicate between masters
+
       proxy_env:
         type: dict
         description: Internet proxy configurations
         default: ~
         options:
           HTTP_PROXY:
+            required: true
           HTTPS_PROXY:
+            required: true
           NO_PROXY:
+            required: true
 
       systemd_dir:
         description: Path to systemd services
diff --git a/roles/k3s_agent/templates/k3s.service.j2 b/roles/k3s_agent/templates/k3s.service.j2
index dac88de..52aa272 100644
--- a/roles/k3s_agent/templates/k3s.service.j2
+++ b/roles/k3s_agent/templates/k3s.service.j2
@@ -12,7 +12,7 @@ ExecStart=/usr/local/bin/k3s agent \
   --server https://{{ apiserver_endpoint | ansible.utils.ipwrap }}:6443 \
   {% if is_pxe_booted | default(false) %}--snapshotter native \
   {% endif %}--token {{ hostvars[groups[group_name_master | default('master')][0]]['token'] | default(k3s_token) }} \
-  {{ extra_agent_args | default("") }}
+  {{ extra_agent_args }}
 KillMode=process
 Delegate=yes
 LimitNOFILE=1048576
diff --git a/roles/k3s_custom_registries/defaults/main.yml b/roles/k3s_custom_registries/defaults/main.yml
deleted file mode 100644
index 704aec7..0000000
--- a/roles/k3s_custom_registries/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# Indicates whether custom registries for k3s should be configured
-# Possible values:
-#   - present
-#   - absent
-state: present
diff --git a/roles/k3s_custom_registries/meta/main.yml b/roles/k3s_custom_registries/meta/main.yml
index 0ec0e7c..3c0878f 100644
--- a/roles/k3s_custom_registries/meta/main.yml
+++ b/roles/k3s_custom_registries/meta/main.yml
@@ -17,3 +17,4 @@ argument_specs:
             If all you need is your own images and you don't care about
             caching the docker/quay/ghcr.io images, you can just remove
             those from the mirrors: section.
+        required: true