diff --git a/Dockerfile b/Dockerfile
index 5efc555..e8a327a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM xrally/xrally-openstack:0.10.1
+FROM xrally/xrally-openstack:0.11.2
 
 SHELL ["/bin/bash", "-xec"]
 
@@ -11,18 +11,14 @@
 RUN mkdir -p cvp-configuration
 
 RUN git clone https://github.com/openstack/tempest && \
-    pushd tempest; git checkout 17.2.0; pip install -r requirements.txt; \
-    popd;
-
-RUN git clone https://github.com/openstack/telemetry-tempest-plugin && \
-    pushd telemetry-tempest-plugin; git checkout 7a4bff728fbd8629ec211669264ab645aa921e2b; pip install -r requirements.txt; \
+    pushd tempest; git checkout 18.0.0; pip install -r requirements.txt; \
     popd;
 
 RUN git clone https://github.com/openstack/heat-tempest-plugin && \
-    pushd heat-tempest-plugin; git checkout 12b770e923060f5ef41358c37390a25be56634f0; pip install -r requirements.txt; \
+    pushd heat-tempest-plugin; git checkout 0.2.0; pip install -r requirements.txt; \
     popd;
 
-RUN pip install --force-reinstall python-cinderclient==3.2.0
+RUN pip install --force-reinstall python-cinderclient==3.2.0 python-glanceclient==2.11
 
 COPY rally/ /var/lib/cvp-configuration/rally
 COPY tempest/ /var/lib/cvp-configuration/tempest
diff --git a/tempest/skip-list-fip-only.yaml b/tempest/skip-list-fip-only.yaml
index 8dd4d26..5997561 100644
--- a/tempest/skip-list-fip-only.yaml
+++ b/tempest/skip-list-fip-only.yaml
@@ -1,16 +1 @@
 tempest.scenario.test_minimum_basic.TestMinimumBasicScenario.test_minimum_basic_scenario[compute,id-bdbb5441-9204-419d-a225-b4fdbfb1a1a8,image,network,volume]: FIP net is not configured
-tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsAssociationTestJSON.test_associate_already_associated_floating_ip[id-6edef4b2-aaf1-4abc-bbe3-993e2561e0fe]: FIP net is not configured
-tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsAssociationTestJSON.test_associate_disassociate_floating_ip[id-307efa27-dc6f-48a0-8cd2-162ce3ef0b52]: FIP net is not configured
-tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsTestJSON.test_allocate_floating_ip[id-f7bfb946-297e-41b8-9e8c-aba8e9bb5194]: FIP net is not configured
-tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsTestJSON.test_associate_already_associated_floating_ip[id-6edef4b2-aaf1-4abc-bbe3-993e2561e0fe]: FIP net is not configured
-tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsTestJSON.test_associate_disassociate_floating_ip[id-307efa27-dc6f-48a0-8cd2-162ce3ef0b52]: FIP net is not configured
-tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsTestJSON.test_delete_floating_ip[id-de45e989-b5ca-4a9b-916b-04a52e7bbb8b]: FIP net is not configured
-tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]: FIP net is not configured
-tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]: FIP net is not configured
-tempest.api.compute.floating_ips.test_list_floating_ips_negative.FloatingIPDetailsNegativeTestJSON.test_get_nonexistent_floating_ip_details[id-7ab18834-4a4b-4f28-a2c5-440579866695,negative]: FIP net is not configured
-tempest.api.compute.floating_ips.test_list_floating_ips.FloatingIPDetailsTestJSON.test_get_floating_ip_details[id-eef497e0-8ff7-43c8-85ef-558440574f84]: FIP net is not configured
-tempest.api.compute.floating_ips.test_list_floating_ips.FloatingIPDetailsTestJSON.test_list_floating_ip_pools[id-df389fc8-56f5-43cc-b290-20eda39854d3]: FIP net is not configured
-tempest.api.compute.floating_ips.test_list_floating_ips.FloatingIPDetailsTestJSON.test_list_floating_ips[id-16db31c3-fb85-40c9-bbe2-8cf7b67ff99f]: FIP net is not configured
-tempest.api.compute.servers.test_server_rescue.ServerRescueTestJSON.test_rescue_unrescue_instance[id-fd032140-714c-42e4-a8fd-adcd8df06be6]: FIP net is not configured
-tempest.api.compute.servers.test_server_rescue.ServerRescueTestJSON.test_rescued_vm_add_remove_security_group[id-affca41f-7195-492d-8065-e09eee245404]: FIP net is not configured
-tempest.api.compute.servers.test_server_rescue.ServerRescueTestJSON.test_rescued_vm_associate_dissociate_floating_ip[id-4842e0cf-e87d-4d9d-b61f-f4791da3cacc]: FIP net is not configured
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index 07d41a8..84bc6e2 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -1,6 +1,3 @@
-[DEFAULT]
-lock_path = /tmp
-
 [compute]
 image_ref_alt = ${IMAGE_REF2}
 min_microversion = 2.1
@@ -8,10 +5,6 @@
 volume_device_name = vdc
 min_compute_nodes = 2
 endpoint_type = publicURL
-ping_timeout = 20
-ping_count = 5
-ssh_timeout = 90
-ssh_channel_timeout = 100
 build_timeout = 120
 fixed_network_name = ${FIXED_NET}
 
@@ -35,7 +28,7 @@
 minimal_instance_type = m1.tiny
 network_for_ssh = net_name
 floating_network_name = net_name
-fixed_subnet_name = subnet_name
+fixed_subnet_name = fixed-subnet
 disable_ssl_certificate_validation = True
 image_ref = ${IMAGE_REF2}
 minimal_image_ref = ${IMAGE_REF2}
@@ -59,14 +52,21 @@
 [network]
 build_timeout = 120
 endpoint_type = publicURL
+# leave empty if you do not have fip net
+#public_network_id = 
+# remove if you do not have fip net
+#floating_network_name = 
 
 [network-feature-enabled]
 port_security = true
+# uncomment if you do not have fip net
+#floating_ips = false
 
 [validation]
 run_validation = true
 image_ssh_password = cubswin:)
 ssh_timeout = 130
+ping_timeout = 20
 
 [object-storage]
 container_sync_timeout = 120
@@ -76,11 +76,6 @@
 #for ceph
 discoverability = false
 
-[orchestration]
-max_template_size = 5440000
-max_resources_per_stack = 20000
-endpoint_type = publicURL
-
 [volume]
 max_microversion = latest
 build_timeout = 120
@@ -95,6 +90,5 @@
 cinder = True
 
 [volume-feature-enabled]
-api_v3 = true
 manage_snapshot = true
 backup = False