diff --git a/metal/roles/k3s/tasks/main.yml b/metal/roles/k3s/tasks/main.yml
index 04f9b474..ec46c4eb 100644
--- a/metal/roles/k3s/tasks/main.yml
+++ b/metal/roles/k3s/tasks/main.yml
@@ -39,26 +39,11 @@
     content: "{{ k3s_token_base64.content | b64decode }}"
     dest: "{{ k3s_token_file }}"
 
-- name: Copy k3s config files to master nodes
+- name: Copy k3s config files
   when: "'masters' in group_names"
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
-  vars:
-    node_role: server
-  loop:
-    - src: config.yaml.j2
-      dest: "{{ k3s_config_file }}"
-    - src: k3s.service.j2
-      dest: "{{ k3s_service_file }}"
-
-- name: Copy k3s config files to worker nodes
-  when: "'workers' in group_names"
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-  vars:
-    node_role: agent
   loop:
     - src: config.yaml.j2
       dest: "{{ k3s_config_file }}"
diff --git a/metal/roles/k3s/templates/config.yaml.j2 b/metal/roles/k3s/templates/config.yaml.j2
index eda6f511..adbf009c 100644
--- a/metal/roles/k3s/templates/config.yaml.j2
+++ b/metal/roles/k3s/templates/config.yaml.j2
@@ -1 +1 @@
-{{ node_role }}
+{{ 'server' if 'masters' in group_names else 'agent' }}
diff --git a/metal/roles/k3s/templates/k3s.service.j2 b/metal/roles/k3s/templates/k3s.service.j2
index 9fb43616..ee1c15ef 100644
--- a/metal/roles/k3s/templates/k3s.service.j2
+++ b/metal/roles/k3s/templates/k3s.service.j2
@@ -7,7 +7,7 @@ After=network-online.target
 Type=notify
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
-ExecStart=/usr/local/bin/k3s {{ node_role }}
+ExecStart=/usr/local/bin/k3s {{ 'server' if 'masters' in group_names else 'agent' }}
 KillMode=process
 Delegate=yes
 # Having non-zero Limit*s causes performance problems due to accounting overhead