diff --git a/roles/k3s/master/tasks/main.yml b/roles/k3s/master/tasks/main.yml
index 8c02e3f..689eb36 100644
--- a/roles/k3s/master/tasks/main.yml
+++ b/roles/k3s/master/tasks/main.yml
@@ -111,21 +111,21 @@
 
 - name: Wait for node-token
   wait_for:
-    path: "{{ k3s_server_location }}/server/node-token"
+    path: /var/lib/rancher/k3s/server/node-token
 
 - name: Register node-token file access mode
   stat:
-    path: "{{ k3s_server_location }}/server/node-token"
+    path: /var/lib/rancher/k3s/server
   register: p
 
 - name: Change file access node-token
   file:
-    path: "{{ k3s_server_location }}/server/node-token"
+    path: /var/lib/rancher/k3s/server
     mode: "g+rx,o+rx"
 
 - name: Read node-token from master
   slurp:
-    path: "{{ k3s_server_location }}/server/node-token"
+    src: /var/lib/rancher/k3s/server/node-token
   register: node_token
 
 - name: Store Master node-token
@@ -134,7 +134,7 @@
 
 - name: Restore node-token file access
   file:
-    path: "{{ k3s_server_location }}/server/node-token"
+    path: /var/lib/rancher/k3s/server
     mode: "{{ p.stat.mode }}"
 
 - name: Create directory .kube
diff --git a/roles/k3s/master/templates/k3s.service.j2 b/roles/k3s/master/templates/k3s.service.j2
index a56ab10..ae5cb48 100644
--- a/roles/k3s/master/templates/k3s.service.j2
+++ b/roles/k3s/master/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 server --data-dir {{ k3s_server_location }} {{ extra_server_args | default("") }}
+ExecStart=/usr/local/bin/k3s server {{ extra_server_args | default("") }}
 KillMode=process
 Delegate=yes
 # Having non-zero Limit*s causes performance problems due to accounting overhead
diff --git a/roles/prereq/tasks/main.yml b/roles/prereq/tasks/main.yml
index e857729..97617cf 100644
--- a/roles/prereq/tasks/main.yml
+++ b/roles/prereq/tasks/main.yml
@@ -17,7 +17,6 @@
     value: "1"
     state: present
     reload: yes
-  when: ansible_all_ipv6_addresses
 
 - name: Add br_netfilter to /etc/modules-load.d/
   copy: