diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
index 4b8fac8..c3e09fa 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
@@ -101,7 +101,7 @@
       env_name: { get_param: env_name }
   subnets:
     depends_on: [networks]
-    type: MCP::Subnets
+    type: MCP::SubnetsWithFloating
     properties:
       stack_name: { get_param: "OS::stack_name" }
       env_name: { get_param: env_name }
@@ -666,7 +666,7 @@
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
   foundation_node:
-    type: MCP::FoundationNode
+    type: MCP::FoundationNodeWithFloating
     depends_on: [subnets]
     properties:
       env_name: { get_param: env_name }
@@ -1100,10 +1100,4 @@
       get_attr:
       - foundation_node
       - instance_floating_address
-  cfg_public_ip:
-    description: CFG node IP address (floating) from external network
-    value:
-      get_attr:
-      - cfg01_node
-      - instance_floating_address
 ...