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}