diff --git a/tcp_tests/templates/_heat_environments/fragments/Compute.yaml b/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
index 898f7c6..ce89cdb 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
@@ -88,19 +88,6 @@
         roles:
         - salt_minion
 
-  floating_ip:
-    depends_on: [instance_instance]
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network: { get_param: net_public }
-      port_id: { get_resource: instance_port01 }
-  floating_ip_association:
-    depends_on: [floating_ip]
-    type: OS::Neutron::FloatingIPAssociation
-    properties:
-      floatingip_id:  { get_resource: floating_ip }
-      port_id: { get_resource: instance_port01 }
-
 outputs:
   instance_address:
     value:
diff --git a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
index 29659ac..b0c0e63 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
@@ -82,19 +82,6 @@
         roles:
         - salt_minion
 
-  floating_ip:
-    depends_on: [instance_instance]
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network: { get_param: net_public }
-      port_id: { get_resource: instance_port01 }
-  floating_ip_association:
-    depends_on: [floating_ip]
-    type: OS::Neutron::FloatingIPAssociation
-    properties:
-      floatingip_id:  { get_resource: floating_ip }
-      port_id: { get_resource: instance_port01 }
-
 outputs:
   instance_address:
     value: