diff --git a/classes/cluster/k8s-ha-contrail-40/infra/config.yml b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
index 69a8d1b..217a0fd 100644
--- a/classes/cluster/k8s-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
@@ -10,6 +10,7 @@
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
 - cluster.k8s-ha-contrail-40.infra
+- cluster.overrides
 
 parameters:
   _param:
@@ -113,23 +114,22 @@
               - cluster.<<node_cluster>>.kubernetes.compute
       node:
         kubernetes_control_node01:
+          classes:
+            - cluster.${_param:cluster_name}.opencontrail.control
           params:
             rabbitmq_cluster_role: master
             opencontrail_database_id: 1
-          node_class:
-            value_template:
-              - cluster.<<node_cluster>>.opencontrail.control
+
         kubernetes_control_node02:
+          classes:
+            - cluster.${_param:cluster_name}.opencontrail.control
           params:
             rabbitmq_cluster_role: slave
             opencontrail_database_id: 2
-          node_class:
-            value_template:
-              - cluster.<<node_cluster>>.opencontrail.control
+
         kubernetes_control_node03:
+          classes:
+            - cluster.${_param:cluster_name}.opencontrail.control
           params:
             rabbitmq_cluster_role: slave
             opencontrail_database_id: 3
-          node_class:
-            value_template:
-              - cluster.<<node_cluster>>.opencontrail.control