diff --git a/README.md b/README.md
index c966dd05b..96fa7d910 100644
--- a/README.md
+++ b/README.md
@@ -36,32 +36,3 @@ gpg --export-secret-keys --armor <GPG_KEY_ID> | kubectl create secret generic so
 ```bash
 sops --encrypt --pgp=<GPG_KEY_ID> --encrypted-regex '^(data|stringData)$' --in-place <FILE_PATH>
 ```
-
-## Labels nodes
-
-```bash
-
-kubectl taint node k3s-server k3s-controlplane=true:NoSchedule
-
-kubectl label node k3s-worker1 node-role.kubernetes.io/worker=true
-kubectl label node k3s-worker2 node-role.kubernetes.io/worker=true
-kubectl label node k3s-worker3 node-role.kubernetes.io/worker=true
-
-kubectl annotate node k3s-worker1 node.longhorn.io/default-node-tags='["storage","fast"]'
-kubectl annotate node k3s-worker2 node.longhorn.io/default-node-tags='["storage","fast"]'
-kubectl annotate node k3s-worker3 node.longhorn.io/default-node-tags='["storage","fast"]'
-
-kubectl annotate node k3s-worker1 node.longhorn.io/create-default-disk='config'
-kubectl annotate node k3s-worker2 node.longhorn.io/create-default-disk='config'
-kubectl annotate node k3s-worker3 node.longhorn.io/create-default-disk='config'
-
-kubectl annotate node k3s-worker1 node.longhorn.io/default-disks-config=[ { "name":"fast-ssd-disk", "path":"/var/lib/longhorn", "allowScheduling":true, "storageReserved":304857600, "tags":[ "ssd", "fast" ] }]
-kubectl annotate node k3s-worker2 node.longhorn.io/default-disks-config=[ { "name":"fast-ssd-disk", "path":"/var/lib/longhorn", "allowScheduling":true, "storageReserved":304857600, "tags":[ "ssd", "fast" ] }]
-kubectl annotate node k3s-worker3 node.longhorn.io/default-disks-config=[ { "name":"fast-ssd-disk", "path":"/var/lib/longhorn", "allowScheduling":true, "storageReserved":304857600, "tags":[ "ssd", "fast" ] }]
-
-kubectl annotate node k3s-worker1 k3s-upgrade='true'
-kubectl annotate node k3s-worker2 k3s-upgrade='true'
-kubectl annotate node k3s-worker3 k3s-upgrade='true'
-```
-
-https://github.com/rancher/k3s/issues/1401 for k3s-system deployment
diff --git a/server/ansible/inventory/home-cluster/group_vars/server-nodes/k3s-settings.yml b/server/ansible/inventory/home-cluster/group_vars/server-nodes/k3s-settings.yml
index 942a5b97b..74c81f024 100644
--- a/server/ansible/inventory/home-cluster/group_vars/server-nodes/k3s-settings.yml
+++ b/server/ansible/inventory/home-cluster/group_vars/server-nodes/k3s-settings.yml
@@ -1,5 +1,4 @@
 ---
-
 # https://rancher.com/docs/k3s/latest/en/installation/install-options/server-config/
 # https://github.com/PyratLabs/ansible-role-k3s#server-control-plane-configuration
 
@@ -10,13 +9,15 @@ k3s_control_node: true
 k3s_server:
   node-ip: "{{ ansible_host }}"
   docker: false
-  flannel-backend: 'none' # This needs to be in quotes
+  flannel-backend: "none" # This needs to be in quotes
   disable:
-  - flannel
-  - traefik
-  - servicelb
-  - metrics-server
-  - local-storage
+    - flannel
+    - traefik
+    - servicelb
+    - metrics-server
+    - local-storage
+  node-taint:
+    - "k3s-controlplane=true:NoSchedule"
   disable-network-policy: true
   disable-cloud-controller: true
   write-kubeconfig-mode: "644"
diff --git a/server/ansible/inventory/home-cluster/group_vars/worker-nodes/k3s-settings.yml b/server/ansible/inventory/home-cluster/group_vars/worker-nodes/k3s-settings.yml
index 045f66447..8781778eb 100644
--- a/server/ansible/inventory/home-cluster/group_vars/worker-nodes/k3s-settings.yml
+++ b/server/ansible/inventory/home-cluster/group_vars/worker-nodes/k3s-settings.yml
@@ -8,3 +8,6 @@ k3s_control_node: false
 # k3s settings for all worker nodes
 k3s_agent:
   node-ip: "{{ ansible_host }}"
+  node-label:
+    - "node-role.kubernetes.io/worker=true"
+    - "k3s-upgrade=true"