diff --git a/test-environments/ips-from-pool-all.yaml b/test-environments/ips-from-pool-all.yaml
index 2311ae86d..f92c65407 100644
--- a/test-environments/ips-from-pool-all.yaml
+++ b/test-environments/ips-from-pool-all.yaml
@@ -8,7 +8,7 @@ resource_registry:
   OS::TripleO::Compute::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
   OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api_from_pool.yaml
   OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_from_pool.yaml
-  OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
+  OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt_from_pool.yaml
   OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant_from_pool.yaml
 
   OS::TripleO::CephStorage::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
@@ -72,6 +72,8 @@ parameter_defaults:
     - 172.17.0.249
     storage:
     - 172.18.0.249
+    storage_mgmt:
+    - 172.19.0.249
     tenant:
     - 172.16.0.249
   CephStorageIPs:
diff --git a/test-environments/network-templates/network-isolation-absolute.yaml b/test-environments/network-templates/network-isolation-absolute.yaml
index 7fede9dae..ee44a9f28 100644
--- a/test-environments/network-templates/network-isolation-absolute.yaml
+++ b/test-environments/network-templates/network-isolation-absolute.yaml
@@ -20,6 +20,7 @@ resource_registry:
   OS::TripleO::Network::StorageMgmt: /usr/share/openstack-tripleo-heat-templates/network/storage_mgmt.yaml
   OS::TripleO::Network::Ports::StorageMgmtVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
   OS::TripleO::Controller::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
+  OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
   OS::TripleO::CephStorage::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
   # Tenant
   OS::TripleO::Network::Tenant: /usr/share/openstack-tripleo-heat-templates/network/tenant.yaml
diff --git a/test-environments/network-templates/network-isolation.yaml b/test-environments/network-templates/network-isolation.yaml
index 2c18f2f4b..328a8eeb2 100644
--- a/test-environments/network-templates/network-isolation.yaml
+++ b/test-environments/network-templates/network-isolation.yaml
@@ -20,6 +20,7 @@ resource_registry:
   OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt.yaml
   OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt.yaml
   OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
+  OS::TripleO::Compute::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
   OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
   # Tenant
   OS::TripleO::Network::Tenant: ../network/tenant.yaml
diff --git a/test-environments/network-templates/nic-configs/compute.yaml b/test-environments/network-templates/nic-configs/compute.yaml
index fa2d33ff3..5edad4f06 100644
--- a/test-environments/network-templates/nic-configs/compute.yaml
+++ b/test-environments/network-templates/nic-configs/compute.yaml
@@ -121,6 +121,12 @@ resources:
               name: nic6
               mtu: 1350
               primary: true
+          - type: interface
+            name: nic5
+            mtu: 1350
+            use_dhcp: false
+            addresses:
+            - ip_netmask: {get_param: StorageMgmtIpSubnet}
       group: os-apply-config
     type: OS::Heat::StructuredConfig
 
diff --git a/test-environments/network-templates/ui-settings.pickle b/test-environments/network-templates/ui-settings.pickle
index 195eabc36..ea6dd37f4 100644
--- a/test-environments/network-templates/ui-settings.pickle
+++ b/test-environments/network-templates/ui-settings.pickle
@@ -638,4 +638,34 @@ sVname
 p312
 Vbr-tenant
 p313
+sa(dp314
+Vaddresses
+p315
+(lp316
+sVnetwork
+p317
+VStorageMgmt
+p318
+sVprimary
+p319
+I01
+sVmtu
+p320
+I1350
+sg71
+(lp321
+sVroutes
+p322
+(lp323
+sVuse_dhcp
+p324
+I00
+sVtype
+p325
+Vinterface
+p326
+sVname
+p327
+Vnic5
+p328
 sass.
\ No newline at end of file