diff --git a/.github/workflows/k8s-native-upgrade.yaml b/.github/workflows/k8s-native-upgrade.yaml
index dcf21c647..0332c9566 100644
--- a/.github/workflows/k8s-native-upgrade.yaml
+++ b/.github/workflows/k8s-native-upgrade.yaml
@@ -873,17 +873,6 @@ jobs:
           echo "CLUSTER_SECRET=${CLUSTER_SECRET}" >> $GITHUB_ENV
           echo "R25_ADMIN_POD=${ADMIN_POD}" >> $GITHUB_ENV
 
-      - name: Label worker nodes for R25 storage plane
-        if: ${{ github.event.inputs.use_existing_cluster != 'true' && github.event.inputs.upgrade_type == 'r25-to-r2x' }}
-        run: |
-          set -euxo pipefail
-          echo "=== Labeling worker nodes for R25 storage plane ==="
-          IFS=',' read -ra NODES <<< "${{ github.event.inputs.worker_nodes }}"
-          for NODE in "${NODES[@]}"; do
-            kubectl label node "$NODE" io.simplyblock.node-type=simplyblock-storage-plane --overwrite
-            echo "Labeled $NODE with io.simplyblock.node-type=simplyblock-storage-plane"
-          done
-
       - name: Install spdk-csi chart for R25 storage nodes
         if: ${{ github.event.inputs.use_existing_cluster != 'true' && github.event.inputs.upgrade_type == 'r25-to-r2x' }}
         run: |
diff --git a/R25_MANUAL_SETUP_STEPS.md b/R25_MANUAL_SETUP_STEPS.md
index ee3d5e3c4..6bed43c64 100644
--- a/R25_MANUAL_SETUP_STEPS.md
+++ b/R25_MANUAL_SETUP_STEPS.md
@@ -157,16 +157,11 @@ fi
 
 ---
 
-## Phase 4: Label workers + Install R25 spdk-csi chart
+## Phase 4: Install R25 spdk-csi chart
 
 ```bash
 NAMESPACE=simplyblock
 
-# Label workers
-for NODE in worker-0.ocp.simplyblock.ai worker-1.ocp.simplyblock.ai worker-2.ocp.simplyblock.ai worker-3.ocp.simplyblock.ai worker-4.ocp.simplyblock.ai worker-5.ocp.simplyblock.ai; do
-  kubectl label node "$NODE" io.simplyblock.node-type=simplyblock-storage-plane --overwrite
-done
-
 # Clone simplyblock-operator (R25 CSI chart branch)
 git clone --branch v0.2.4 https://github.com/simplyblock/simplyblock-operator.git simplyblock-operator-r25
 
diff --git a/UPGRADE.md b/UPGRADE.md
index b029cb088..d8629c6ea 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -67,18 +67,7 @@ Cluster ID:     <CLUSTER_UUID>
 Cluster Secret: <CLUSTER_SECRET>
 ```
 
-### 1.3 Label Worker Nodes for Storage Plane
-
-The R25 spdk-csi chart uses the `io.simplyblock.node-type` label to discover which
-worker nodes should run storage node pods. Label all workers before installing the chart:
-
-```bash
-for NODE in <worker-node-1> <worker-node-2> <worker-node-3>; do
-    kubectl label node "$NODE" io.simplyblock.node-type=simplyblock-storage-plane --overwrite
-done
-```
-
-### 1.4 Install the `spdk-csi` Helm Chart (Includes Storage Node Creation)
+### 1.3 Install the `spdk-csi` Helm Chart (Includes Storage Node Creation)
 
 This deploys the CSI driver and creates storage nodes via `storagenode.create=true`.
 Use the cluster UUID, secret, and pool name from step 1.2.
@@ -116,7 +105,7 @@ sbcli-dev sn list
 
 **Expected**: All storage nodes show `online` status.
 
-### 1.5 Verify R25.x Cluster
+### 1.4 Verify R25.x Cluster
 
 ```bash
 # Cluster should be active
diff --git a/e2e/scripts/cleanup_upgrade_test.sh b/e2e/scripts/cleanup_upgrade_test.sh
index 94e6f9707..c40f4a69b 100644
--- a/e2e/scripts/cleanup_upgrade_test.sh
+++ b/e2e/scripts/cleanup_upgrade_test.sh
@@ -399,7 +399,6 @@ echo "=== Phase 10: Remove stale node labels ==="
 
 for NODE in "${NODES[@]}"; do
   kubectl label node "$NODE" io.simplyblock.storagenodeset- 2>/dev/null || true
-  kubectl label node "$NODE" io.simplyblock.node-type- 2>/dev/null || true
   echo "  Removed labels from $NODE"
 done