diff --git a/charts/calicoctl-utility/values.yaml b/charts/calicoctl-utility/values.yaml
index 3661c2e6..ab0fcfb8 100644
--- a/charts/calicoctl-utility/values.yaml
+++ b/charts/calicoctl-utility/values.yaml
@@ -58,7 +58,7 @@ release_group: null
 labels:
   utility:
     node_selector_key: openstack-helm-node-class
-    node_selector_value: enabled
+    node_selector_value: primary
   job:
     node_selector_key: openstack-helm-node-class
     node_selector_value: primary
diff --git a/charts/etcdctl-utility/values.yaml b/charts/etcdctl-utility/values.yaml
index 01e087a7..c10f50c2 100644
--- a/charts/etcdctl-utility/values.yaml
+++ b/charts/etcdctl-utility/values.yaml
@@ -38,7 +38,7 @@ images:
 labels:
   utility:
     node_selector_key: openstack-helm-node-class
-    node_selector_value: enabled
+    node_selector_value: primary
   job:
     node_selector_key: openstack-helm-node-class
     node_selector_value: primary