diff --git a/CICD/heat/gc_HOT.yaml b/CICD/heat/gc_HOT.yaml
index 6c2ad1022bee078e8edf60a5ed396ebda361eef6..8574cbedbd9cf68e1bcdd194a653eb55b1449cd2 100644
--- a/CICD/heat/gc_HOT.yaml
+++ b/CICD/heat/gc_HOT.yaml
@@ -151,10 +151,10 @@ resources:
     volume_id: { get_resource: DBVolume }
     instance_uuid: { get_resource: SQLNode0 }
 
-  MgmtNodes:
+  MgmtNodesC:
    type: "OS::Heat::ResourceGroup"
    properties:
-    count: 2
+    count: 0
     resource_def:
       type: My::Server::MgmtNode
       properties:
@@ -166,6 +166,22 @@ resources:
         ssh_key: { get_param: ssh_key }
         security_groups: [ default, { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: NFSSecGroup }, { get_resource: MySQLSecGroup } ]
         project_name: { get_param: project_name }
+  
+  MgmtNodesU:
+   type: "OS::Heat::ResourceGroup"
+   properties:
+    count: 2
+    resource_def:
+      type: My::Server::MgmtNode
+      properties:
+        #avz: { get_param: avz }
+        image: { get_param: ubuntu_1804_image_id }
+        ansible_ssh_user: ubuntu
+        mynodename:
+         list_join: [ '-', [ { get_param: "OS::stack_name" }, 'mgmt%index%' ]]
+        ssh_key: { get_param: ssh_key }
+        security_groups: [ default, { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: NFSSecGroup }, { get_resource: MySQLSecGroup } ]
+        project_name: { get_param: project_name }
 
   LoginNodesC:
    type: "OS::Heat::ResourceGroup"
diff --git a/CICD/heat/resource_registry.yaml b/CICD/heat/resource_registry.yaml
index 0638b887c8c09d5d6a98f51a34d3b4eeb6e9aafb..366990e05979bdfd810c6ee7acad98eb2bee9f48 100644
--- a/CICD/heat/resource_registry.yaml
+++ b/CICD/heat/resource_registry.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  My::Server::MgmtNode: mgmtnode_HOT.yaml
+  My::Server::MgmtNode: mgmtnode_HOT.yaml
\ No newline at end of file