diff --git a/metadata/service/tempest/heat.yml b/metadata/service/tempest/heat.yml
new file mode 100644
index 0000000..95848b3
--- /dev/null
+++ b/metadata/service/tempest/heat.yml
@@ -0,0 +1,27 @@
+parameters:
+  neutron:
+    client:
+      enabled: true
+      server:
+        admin_identity:
+          router:
+            heat-router:
+              tenant: admin
+              admin_state_up: True
+              gateway_network: ${_param:runtest_tempest_public_net}
+              interfaces:
+                - heat-subnet
+          network:
+            heat-net:
+              tenant: admin
+              shared: False
+              router_external: False
+              admin_state_up: True
+              subnet:
+                heat-subnet:
+                  cidr: 10.20.30.0/24
+                  allocation_pools:
+                    - start: 10.20.30.10
+                      end: 10.20.30.254
+                  gateway: 10.20.30.1
+                  enable_dhcp: True
\ No newline at end of file
diff --git a/metadata/service/tempest/init.yml b/metadata/service/tempest/init.yml
index 162d983..707ca47 100644
--- a/metadata/service/tempest/init.yml
+++ b/metadata/service/tempest/init.yml
@@ -2,7 +2,7 @@
   - service.runtest.tempest.artifactory
   - service.runtest.tempest.glance
   - service.runtest.tempest.nova
-  - service.runtest.tempest.neutron
+  - service.runtest.tempest.heat
 applications:
   - runtest
 parameters:
diff --git a/metadata/service/tempest/neutron.yml b/metadata/service/tempest/neutron.yml
index b159012..d1a7c38 100644
--- a/metadata/service/tempest/neutron.yml
+++ b/metadata/service/tempest/neutron.yml
@@ -2,29 +2,6 @@
   neutron:
     client:
       enabled: true
-      server:
-        admin_identity:
-          router:
-            heat-router:
-              tenant: admin
-              admin_state_up: True
-              gateway_network: ${_param:runtest_tempest_public_net}
-              interfaces:
-                - heat-subnet
-          network:
-            heat-net:
-              tenant: admin
-              shared: False
-              router_external: False
-              admin_state_up: True
-              subnet:
-                heat-subnet:
-                  cidr: 10.20.30.0/24
-                  allocation_pools:
-                    - start: 10.20.30.10
-                      end: 10.20.30.254
-                  gateway: 10.20.30.1
-                  enable_dhcp: True
       resources:
         v2:
           admin_identity: