diff --git a/scripts/operations/kubernetes/encryption.sh b/scripts/operations/kubernetes/encryption.sh
index 1c969e9cf2fb..00fc4181a3a1 100755
--- a/scripts/operations/kubernetes/encryption.sh
+++ b/scripts/operations/kubernetes/encryption.sh
@@ -2,7 +2,7 @@
 #
 # MIT License
 #
-# (C) Copyright 2022-2023 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2022-2024 Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -682,7 +682,7 @@ commatospace() {
 # controlplane nodes have the encryption file so no sense in annotating anything
 # that isn't a control-plane.
 kubectl_get_controlplane_nodes() {
-  kubectl get nodes --selector=node-role.kubernetes.io/master --no-headers=true -o custom-columns=NAME:.metadata.name
+  kubectl get nodes --selector=node-role.kubernetes.io/control-plane --no-headers=true -o custom-columns=NAME:.metadata.name
 }
 
 # Get the current node annotation values
diff --git a/workflows/iuf/operations/management-nodes-rollout/management-storage-nodes-rollout.yaml b/workflows/iuf/operations/management-nodes-rollout/management-storage-nodes-rollout.yaml
index 4c3b0a209d1c..aa5d533a593e 100644
--- a/workflows/iuf/operations/management-nodes-rollout/management-storage-nodes-rollout.yaml
+++ b/workflows/iuf/operations/management-nodes-rollout/management-storage-nodes-rollout.yaml
@@ -30,6 +30,9 @@ spec:
     - key: "node-role.kubernetes.io/master"
       operator: "Exists"
       effect: "NoSchedule"
+    - key: "node-role.kubernetes.io/control-plane"
+      operator: "Exists"
+      effect: "NoSchedule"
   entrypoint: main
   templates:
     - name: main