diff --git a/cluster/core/system-upgrade/plans/server-plan.yaml b/cluster/core/system-upgrade/plans/server-plan.yaml
index 1ce81ae9b..73cbb940f 100644
--- a/cluster/core/system-upgrade/plans/server-plan.yaml
+++ b/cluster/core/system-upgrade/plans/server-plan.yaml
@@ -1,7 +1,4 @@
 ---
-#
-# Server plan
-#
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
@@ -10,25 +7,19 @@ metadata:
   labels:
     k3s-upgrade: server
 spec:
-  concurrency: 1
-  cordon: true
+  concurrency: 1 # Batch size (roughly maps to maximum number of unschedulable nodes)
+  channel: https://update.k3s.io/v1-release/channels/v1.24
   nodeSelector:
     matchExpressions:
-      - key: node-role.kubernetes.io/master
-        operator: In
-        values:
-          - "true"
-      - key: k3os.io/mode
-        operator: DoesNotExist
-      - key: kubernetes.io/arch
-        operator: In
-        values:
-          - "amd64"
-  serviceAccountName: system-upgrade
+      - { key: k3s-upgrade, operator: Exists }
+      - { key: k3s-upgrade, operator: NotIn, values: ["disabled", "false"] }
+      - { key: k3os.io/mode, operator: DoesNotExist }
+      - { key: node-role.kubernetes.io/master, operator: Exists }
   tolerations:
     - key: "node-role.kubernetes.io/control-plane"
       operator: "Exists"
       effect: "NoSchedule"
+  serviceAccountName: system-upgrade
+  cordon: true
   upgrade:
     image: rancher/k3s-upgrade
-  channel: https://update.k3s.io/v1-release/channels/v1.24