diff --git a/tasks/k3s/install.yaml b/tasks/k3s/install.yaml
index 2c50cc4..7ea2982 100644
--- a/tasks/k3s/install.yaml
+++ b/tasks/k3s/install.yaml
@@ -206,6 +206,23 @@
   #   kubernetes_config.cluster.prime.name == inventory_hostname
 
 
+- name: Fetch Join Token
+  ansible.builtin.slurp:
+    src: /var/lib/rancher/k3s/server/token
+  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
+  run_once: true
+  register: k3s_join_token
+  no_log: true # Value is sensitive
+
+
+- name: Create Token fact
+  ansible.builtin.set_fact:
+    k3s_join_token: "{{ k3s_join_token.content | b64decode | replace('\n', '') }}"
+  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
+  run_once: true
+  no_log: true # Value is sensitive
+
+
 - name: Copy Intial required templates
   ansible.builtin.template:
     src: "{{ item.src }}"
@@ -307,23 +324,6 @@
     kubernetes_config.cluster.networking.encrypt | default(false) | bool
 
 
-- name: Fetch Join Token
-  ansible.builtin.slurp:
-    src: /var/lib/rancher/k3s/server/token
-  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
-  run_once: true
-  register: k3s_join_token
-  no_log: true # Value is sensitive
-
-
-- name: Create Token fact
-  ansible.builtin.set_fact:
-    k3s_join_token: "{{ k3s_join_token.content | b64decode | replace('\n', '') }}"
-  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
-  run_once: true
-  no_log: true # Value is sensitive
-
-
 - name: Install K3s (master nodes)
   ansible.builtin.shell:
     cmd: |
diff --git a/templates/k3s-config.yaml.j2 b/templates/k3s-config.yaml.j2
index f965d66..9ca6189 100644
--- a/templates/k3s-config.yaml.j2
+++ b/templates/k3s-config.yaml.j2
@@ -72,4 +72,9 @@ server: {% for cluster_node in groups[kubernetes_config.cluster.group_name] -%}
 {% if Kubernetes_Master | default(false) | bool -%}
 servicelb-namespace: {{ kubernetes_config.cluster.networking.service_load_balancer_namespace | default('kube-system') }}
 service-cidr: "{{ KubernetesServiceSubnet }}"
+agent-token: {{ k3s_join_token }}
 {% endif %}
+
+{% if not Kubernetes_Master | default(false) | bool -%}
+token: {{ k3s_join_token }}
+{% endif %}
\ No newline at end of file