diff --git a/metadata/service/tempest/artifactory.yml b/metadata/service/tempest/artifactory.yml
new file mode 100644
index 0000000..8c1ce5f
--- /dev/null
+++ b/metadata/service/tempest/artifactory.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    artifactory_user: artifactory_user
+    artifactory_password: artifactory_password
+  runtest:
+    artifact_collector:
+      enabled: true
+      artifactory:
+       enabled: true
+       user: ${_param:artifactory_user}
+       password: ${_param:artifactory_password}
+       host: artifactory.mcp.mirantis.net
+       port: 443
+       proto: https
+       endpoint: /oscore-local/${_param:cluster_domain}/${_param:infra_config_hostname}
+      artifacts:
+        sys_logs:
+          path: /var/log
+        etc:
+          path: /etc
diff --git a/metadata/service/tempest/init.yml b/metadata/service/tempest/init.yml
index f5c6818..b9dbe3c 100644
--- a/metadata/service/tempest/init.yml
+++ b/metadata/service/tempest/init.yml
@@ -2,6 +2,7 @@
   - service.runtest.tempest.glance
   - service.runtest.tempest.nova
   - service.runtest.tempest.neutron
+  - service.runtest.tempest.artifactory
 applications:
   - runtest
 parameters:
@@ -20,6 +21,10 @@
     runtest_local_img_dir: /tmp
     runtest_local_img_file: ${_param:glance_image_cirros_name}.img
     tempest_test_target: cfg01*
+    runtest_tempest_cfg_dir: /root/test/
+    runtest_tempest_cfg_name: tempest_generated.conf
+    runtest_tempest_log_dir: /home/rally/test/tempest.log
+    runtest_tempest_public_net: public
   runtest:
     enabled: true
     openstack_version: stable/${_param:openstack_version}
@@ -34,6 +39,30 @@
           flavor_ref: 'm1.extra_tiny_test'
           flavor_ref_alt: 'm1.tiny_test'
           image_ref_alt: ${_param:glance_image_cirros_name}
+        network:
+          public_network_id: ${_param:runtest_tempest_public_net}
+      cfg_dir: ${_param:runtest_tempest_cfg_dir}
+      cfg_name: ${_param:runtest_tempest_cfg_name}
+      DEFAULT:
+        log_file: ${_param:runtest_tempest_log_dir}
+      compute:
+        build_timeout: 600
+        min_microversion: 2.1
+        max_microversion: 2.53
+      orchestration:
+        max_template_size: 5440000
+        max_resources_per_stack: 20000
+      dns_feature_enabled:
+        # Switch this to designate_admin_api_enabled once [1] is promoted to stable packages
+        # [1] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/designate.git;a=commit;h=96a3f43f6cf1149559e54a00b5548bdf46333749
+        api_admin: false
+        api_v1: false
+        api_v2: true
+        api_v2_quotas: true
+        api_v2_root_recordsets: true
+        bug_1573141_fixed: true
+      volume-feature-enabled:
+        backup: false
       heat_plugin:
         skip_scenario_test_list: ${_param:runtest_heat_plugin_skip_scenario_test_list}
         skip_functional_test_list: ${_param:runtest_heat_plugin_skip_functional_test_list}