diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index ac2d649..c24acf6 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -161,7 +161,10 @@
         # QA\CVP tool-set's
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: ci-tempest:${_param:openstack_version}
+          name: ci-tempest:pike
+        - registry: ${_param:mcp_docker_registry}/mirantis/cicd
+          target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
+          name: ci-tempest:queens
         - registry: ${_param:mcp_docker_registry}/mirantis/cvp
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
           name: cvp-rally:2019.2.5
diff --git a/defaults/linux_system_file.yml b/defaults/linux_system_file.yml
index c37c030..e0a9bfc 100644
--- a/defaults/linux_system_file.yml
+++ b/defaults/linux_system_file.yml
@@ -26,3 +26,9 @@
         amphora-x64-haproxy-queens.qcow2.md5:
           source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2.md5
           name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2.md5
+        cirros-0.3.5-x86_64-disk.img:
+          source: ${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img
+          name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img
+        Fedora-Cloud-Base-27-1.6.x86_64.qcow2:
+          source: ${_param:mcp_binary_registry}/mirantis/external/images/cloud-fedora/27/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
+          name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cloud-fedora/27/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 70e1004..2976422 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -236,6 +236,12 @@
     #
     amphora_image_name: amphora-x64-haproxy
     amphora_image_url: "${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
+
+    glance_image_cirros_name: 'TestCirros-0.3.5'
+    glance_image_cirros_location: "${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img"
+
+    glance_image_fedora_name: 'TestFedora-27-1.6'
+    glance_image_fedora_location: "${_param:mcp_binary_registry}/mirantis/external/images/cloud-fedora/27/Fedora-Cloud-Base-27-1.6.x86_64.qcow2"
     # Sahara
     mysql_sahara_username: sahara
     keystone_sahara_username: sahara