diff --git a/metadata/service/tempest/init.yml b/metadata/service/tempest/init.yml
index bc7b690..fba2a85 100644
--- a/metadata/service/tempest/init.yml
+++ b/metadata/service/tempest/init.yml
@@ -1,12 +1,14 @@
 classes:
+  - service.runtest.tempest.artifactory
   - service.runtest.tempest.glance
   - service.runtest.tempest.nova
   - service.runtest.tempest.neutron
-  - service.runtest.tempest.artifactory
 applications:
   - runtest
 parameters:
   _param:
+    runtest_tempest_convert_to_uuid_flavor_ref: 'm1.extra_tiny_test'
+    runtest_tempest_convert_to_uuid_flavor_ref_alt: 'm1.tiny_test'
     glance_image_cirros_name: 'TestCirros-0.3.5'
     glance_image_fedora_name: 'TestFedora-27-1.6'
     glance_image_manila_name: 'manila-service-image-master'
@@ -78,9 +80,9 @@
       convert_to_uuid:
         compute:
           image_ref: ${_param:glance_image_cirros_name}
-          flavor_ref: 'm1.extra_tiny_test'
-          flavor_ref_alt: 'm1.tiny_test'
           image_ref_alt: ${_param:glance_image_cirros_name}
+          flavor_ref: ${_param:runtest_tempest_convert_to_uuid_flavor_ref}
+          flavor_ref_alt: ${_param:runtest_tempest_convert_to_uuid_flavor_ref_alt}
           image_ref_nfs: ${_param:glance_image_manila_name}
         network:
           public_network_id: ${_param:runtest_tempest_public_net}
diff --git a/metadata/service/tempest/ironic.yml b/metadata/service/tempest/ironic.yml
index fe75b3e..ba31b60 100644
--- a/metadata/service/tempest/ironic.yml
+++ b/metadata/service/tempest/ironic.yml
@@ -1,7 +1,22 @@
 parameters:
+  _param:
+    runtest_tempest_convert_to_uuid_flavor_ref: baremetal
+  runtest:
+    tempest:
+      network:
+        project_networks_reachable: false
+        floating_network_name: 'public'
+        shared_physical_network: true
+      auth:
+        create_isolated_networks: false
+      baremetal:
+        power_timeout: 600
+        deploywait_timeout: 600
+        active_timeout: 600
+        unprovision_timeout: 600
   nova:
     client:
-      enabled: True
+      enabled: true
       server:
         admin_identity:
           flavor:
@@ -17,7 +32,7 @@
           router:
             baremetal-router:
               tenant: admin
-              admin_state_up: True
+              admin_state_up: true
               gateway_network: ${_param:runtest_tempest_public_net}
               interfaces:
                 - baremetal-subnet
diff --git a/metadata/service/tempest/nova.yml b/metadata/service/tempest/nova.yml
index 0dce923..b4dc560 100644
--- a/metadata/service/tempest/nova.yml
+++ b/metadata/service/tempest/nova.yml
@@ -1,4 +1,7 @@
 parameters:
+  _param:
+    runtest_tempest_convert_to_uuid_flavor_ref: m1.extra_tiny_test
+    runtest_tempest_convert_to_uuid_flavor_ref_alt: m1.tiny_test
   nova:
     client:
       enabled: True
@@ -12,4 +15,4 @@
             m1.extra_tiny_test:
               ram: 256
               disk: 1
-              vcpus: 1
\ No newline at end of file
+              vcpus: 1