diff --git a/Dockerfile b/Dockerfile
index f7c4562..f58b4cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM xrally/xrally-openstack:0.10.1
+FROM xrally/xrally-openstack:0.11.1
 
 SHELL ["/bin/bash", "-xec"]
 
@@ -15,11 +15,11 @@
     popd;
 
 RUN git clone https://github.com/openstack/telemetry-tempest-plugin && \
-    pushd telemetry-tempest-plugin; pip install -r requirements.txt; \
+    pushd telemetry-tempest-plugin; git checkout 7a4bff728fbd8629ec211669264ab645aa921e2b; pip install -r requirements.txt; \
     popd;
 
 RUN git clone https://github.com/openstack/heat-tempest-plugin && \
-    pushd heat-tempest-plugin; git checkout 0.1.0; pip install -r requirements.txt; \
+    pushd heat-tempest-plugin; git checkout 12b770e923060f5ef41358c37390a25be56634f0; pip install -r requirements.txt; \
     popd;
 
 COPY rally/ /var/lib/cvp-configuration/rally
diff --git a/configure.sh b/configure.sh
index ab1d95b..eedca50 100755
--- a/configure.sh
+++ b/configure.sh
@@ -30,29 +30,25 @@
   rally deployment config
 }
 
-additional_tempest_plugins (){
-if [ -n "${PROXY}" ]; then
-  export https_proxy=$PROXY
-fi
-rally verify add-verifier-ext --source https://github.com/openstack/telemetry-tempest-plugin
-rally verify add-verifier-ext --source https://github.com/openstack/heat-tempest-plugin
-unset https_proxy
-}
-
 tempest_configuration () {
   sub_name=`date "+%H_%M_%S"`
-  if [ -n "${OFFLINE}" ]; then
+  # default tempest version is now 17.2.0
+  tempest_version='17.2.0'
+  if [ "$PROXY" == "offline" ]; then
     rally verify create-verifier --name tempest_verifier_$sub_name --type tempest --source $TEMPEST_REPO --system-wide --version $tempest_version
-    cd /var/lib/
+    rally verify add-verifier-ext --source /var/lib/telemetry-tempest-plugin
+    rally verify add-verifier-ext --source /var/lib/heat-tempest-plugin
   else
     if [ -n "${PROXY}" ]; then
       export https_proxy=$PROXY
     fi
     rally verify create-verifier --name tempest_verifier_$sub_name --type tempest --source $TEMPEST_REPO --version $tempest_version
+    rally verify add-verifier-ext --source https://github.com/openstack/telemetry-tempest-plugin
+    rally verify add-verifier-ext --source https://github.com/openstack/heat-tempest-plugin
     unset https_proxy
   fi
-  rally verify configure-verifier --show
-  additional_tempest_plugins
+  # supress tempest.conf display in console
+  #rally verify configure-verifier --show
 }
 
 quick_configuration () {
@@ -90,7 +86,9 @@
 sed -i 's/${IMAGE_REF2}/'$IMAGE_REF2'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's/${FIXED_NET}/'$FIXED_NET'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's/publicURL/'$TEMPEST_ENDPOINT_TYPE'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
-cat $current_path/cvp-configuration/tempest/tempest_ext.conf
+#supress tempest.conf display in console
+#cat $current_path/cvp-configuration/tempest/tempest_ext.conf
+cp $current_path/cvp-configuration/tempest/boot_config_none_env.yaml /home/rally/boot_config_none_env.yaml
 }
 
 if [ "$1" == "reconfigure" ]; then
@@ -107,6 +105,7 @@
     tempest_configuration
     quick_configuration
     rally verify configure-verifier --extend $current_path/cvp-configuration/tempest/tempest_ext.conf
+    rally verify configure-verifier --show
     # Add 2 additional tempest tests (live migration to all nodes + ssh to all nodes)
     # TBD
     #cat tempest/test_extension.py >> repo/tempest/scenario/test_server_multinode.py
diff --git a/tempest/boot_config_none_env.yaml b/tempest/boot_config_none_env.yaml
new file mode 100644
index 0000000..259bddd
--- /dev/null
+++ b/tempest/boot_config_none_env.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig"
diff --git a/tempest/skip-list-oc4.yaml b/tempest/skip-list-oc4.yaml
new file mode 100644
index 0000000..c37db1f
--- /dev/null
+++ b/tempest/skip-list-oc4.yaml
@@ -0,0 +1,25 @@
+tempest.api.network.test_allowed_address_pair.AllowedAddressPairIpV6TestJSON.test_update_port_with_cidr_address_pair[id-4d6d178f-34f6-4bff-a01c-0a2f8fe909e4]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514778.
+tempest.api.network.test_allowed_address_pair.AllowedAddressPairTestJSON.test_update_port_with_cidr_address_pair[id-4d6d178f-34f6-4bff-a01c-0a2f8fe909e4]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514778.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_two_security_groups_and_extra_attributes[id-edf6766d-3d40-4621-bc6e-2521a44c257d]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_security_group_and_extra_attributes[id-58091b66-4ff4-4cc1-a549-05d60c7acd1a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604923.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_two_subnets[id-4544adf7-bb5f-4bdc-b769-b3e77026cef2]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1596917.
+tempest.api.network.test_ports.PortsTestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
+tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_port_with_second_ip[id-63aeadd4-3b49-427f-a3b1-19ca81f06270]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604772.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_slaac_subnet_with_ports[id-88554555-ebf8-41ef-9300-4926d45e06e9]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_stateless_subnet_with_ports[id-2de6ab5a-fcf0-4144-9813-f91a940291f1]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654177
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_slaac[id-176b030f-a923-4040-a755-9dc94329e60c]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateless[id-7d410310-8c86-4902-adf9-865d08e31adb]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_delete_subnet_with_v6_attributes_stateful[id-da40cd1b-a833-4354-9a85-cd9b8a3b74ca]: See https://bugs.launchpad.net/juniperopenstack/+bug/1654179.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_64_subnets[id-4256c61d-c538-41ea-9147-3c450c36669e]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_no_ra[id-ae2f4a5d-03ff-4c42-a3b0-ce2fcb7ea832]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_stateless_eui64[id-e5517e62-6f16-430d-a672-f80875493d4c]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1604564.
+tempest.api.network.test_dhcp_ipv6.NetworksTestDHCPv6.test_dhcpv6_invalid_options[id-81f18ef6-95b5-4584-9966-10d480b7496a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
+tempest.api.network.test_networks.NetworksTest.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951 and https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
+tempest.api.network.test_networks.NetworksIpV6Test.test_update_subnet_gw_dns_host_routes_dhcp[id-3d3852eb-3009-49ec-97ac-5ce83b73010a]: Contrail specific problem. See https://bugs.launchpad.net/juniperopenstack/+bug/1476951 and https://bugs.launchpad.net/juniperopenstack/+bug/1514684.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agent[id-9c80f04d-11f3-44a4-8738-ed2f879b0ff4]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_list_agents_non_admin[id-e335be47-b9a1-46fd-be30-0874c0b751e6]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_show_agent[id-869bc8e8-0fda-4a30-9b71-f8a7cf58ca9f]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_description[id-68a94a14-1243-46e6-83bf-157627e31556]: Agents are not in use in Contrail.
+tempest.api.network.admin.test_agent_management.AgentManagementTestJSON.test_update_agent_status[id-371dfc5b-55b9-4cb5-ac82-c40eadaac941]: Agents are not in use in Contrail.
diff --git a/tempest/skip-list-pike.yaml b/tempest/skip-list-pike.yaml
new file mode 100644
index 0000000..111929e
--- /dev/null
+++ b/tempest/skip-list-pike.yaml
@@ -0,0 +1,4 @@
+tempest.api.compute.admin.test_server_diagnostics.ServerDiagnosticsTest.test_get_server_diagnostics[id-31ff3486-b8a0-4f56-a6c0-aab460531db3]: cannot be verified in Tempest. Works if maxmicroversion is lower 2.36.
+tempest.api.compute.admin.test_server_diagnostics.ServerDiagnosticsV248Test.test_get_server_diagnostics[id-64d0d48c-dff1-11e6-bf01-fe55135034f3]: cannot be verified in Tempest. After microversion 2.36 os-networks nova api extension used in this tests is deprecated.
+tempest.api.compute.admin.test_server_diagnostics_negative.ServerDiagnosticsNegativeV248Test.test_get_server_diagnostics_by_non_admin[id-e84e2234-60d2-42fa-8b30-e2d3049724ac,negative]: cannot be verified in Tempest. After microversion 2.36 os-networks nova api extension used in this tests is deprecated.
+tempest.api.compute.servers.test_servers.ServerShowV247Test.test_show_server[id-88b0bdb2-494c-11e7-a919-92ebcb67fe33]: cannot be verified in Tempest. After microversion 2.36 os-networks nova api extension used in this tests is deprecated.
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index f6e3529..573c3ac 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -1,5 +1,8 @@
+[DEFAULT]
+lock_path = /tmp
+
 [compute]
-image_ref_alt = ${IMAGE_REF2} 
+image_ref_alt = ${IMAGE_REF2}
 min_microversion = 2.1
 max_microversion = latest
 volume_device_name = vdc
@@ -12,6 +15,33 @@
 build_timeout = 120
 fixed_network_name = ${FIXED_NET}
 
+# please review and fill this section
+[heat_plugin]
+image_ref = ${IMAGE_REF2}
+username = admin
+project_name = admin
+admin_project_name = admin
+domain_name = default
+admin_username = admin
+admin_domain_name = default
+endpoint_type = internal
+auth_url =
+admin_password =
+password =
+disable_ssl_certificate_validation = True
+image_ref = ${IMAGE_REF2}
+minimal_image_ref = ${IMAGE_REF2}
+instance_type = m1.tiny
+network_for_ssh =
+floating_network_name =
+region =
+fixed_network_name = ${FIXED_NET}
+fixed_subnet_name =
+minimal_instance_type = m1.tiny
+build_timeout = 180
+ssh_timeout = 30
+boot_config_env = /home/rally/boot_config_none_env.yaml
+
 [compute-feature-enabled]
 nova_cert = True
 personality = True