diff --git a/tempest/skip-list-ocata.yaml b/tempest/skip-list-ocata.yaml
index 5c3a81c..5aa54e3 100644
--- a/tempest/skip-list-ocata.yaml
+++ b/tempest/skip-list-ocata.yaml
@@ -1,5 +1,14 @@
 tempest.api.compute.servers.test_novnc.NoVNCConsoleTestJSON.test_novnc[id-c640fdff-8ab4-45a4-a5d8-7e6146cbd0dc]: See https://bugs.launchpad.net/nova/+bug/1669468.
 tempest.api.compute.admin.test_servers_on_multinodes.ServersOnMultiNodesTest.test_create_servers_on_same_host[id-26a9d5df-6890-45f2-abc4-a659290cb130]: SameHostFilter is not included into nova.conf
+designate_tempest_plugin.tests.api.admin.test_quotas.QuotasAdminTest.test_delete_quotas[id-33e0affb-5d66-4216-881c-f101a779851a,smoke]: admin token is disabled for designate
+designate_tempest_plugin.tests.api.admin.test_quotas.QuotasAdminTest.test_show_quotas[id-ed42f367-e5ba-40d7-a08d-366ad787d21c,smoke]: admin token is disabled for designate
+designate_tempest_plugin.tests.api.admin.test_quotas.QuotasAdminTest.test_update_quotas[id-4f2b65b7-c4e1-489c-9047-755e42ba0985,smoke]: admin token is disabled for designate
+designate_tempest_plugin.tests.api.v1.test_domains.DnsDomainsTest.test_create_update_get_domain[id-29f76dd4-2456-4e42-b0ca-bbffcc6bbf59,smoke]: sometimes may fail because of race condition
+designate_tempest_plugin.tests.api.v2.test_pool.PoolAdminTest.test_list_pools_dot_json_fails[id-41ad6a84-00ce-4a04-9fd5-b7c15c31e2db,smoke]: not applicable
+designate_tempest_plugin.tests.api.v2.test_tld.TldAdminTest.test_list_tlds_dot_json_fails[id-8116dcf5-a329-47d1-90be-5ff32f299c53,smoke]: not applicable
+designate_tempest_plugin.tests.api.v2.test_zones.ZonesTest.test_list_zones_dot_json_fails[id-925192f2-0ed8-4591-8fe7-a9fa028f90a0,smoke]: not applicable
+designate_tempest_plugin.tests.api.v2.test_tsigkey.TsigkeyAdminTest.test_list_tsigkeys_dot_json_fails[id-4bdc20ef-96f9-47f6-a1aa-275159af326b]: not applicable
+designate_tempest_plugin.tests.api.v2.test_zones_imports.ZonesImportTest.test_create_zone_import[id-2e2d907d-0609-405b-9c96-3cb2b87e3dce,smoke]: error on tempest side
 tempest.api.object_storage.test_account_bulk.BulkTest.test_bulk_delete[id-c075e682-0d2a-43b2-808d-4116200d736d]: not compatible with ceph
 tempest.api.object_storage.test_account_bulk.BulkTest.test_bulk_delete_by_POST[id-dbea2bcb-efbb-4674-ac8a-a5a0e33d1d79]: not compatible with ceph
 tempest.api.object_storage.test_account_bulk.BulkTest.test_extract_archive[id-a407de51-1983-47cc-9f14-47c2b059413c]: not compatible with ceph
@@ -118,3 +127,15 @@
 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
+heat_tempest_plugin.tests.functional.test_nova_server_networks.CreateServerTest.test_create_update_server_with_subnet[id-12185eaa-927f-43f3-a525-0424c4eb9b5d]: PROD-22197
+heat_tempest_plugin.tests.scenario.test_aodh_alarm.AodhAlarmTest.test_alarm[id-fc0f18a6-f65c-4df1-b9c5-e160dea59849]: Not applicable for mcp deployments.
+heat_tempest_plugin.tests.functional.test_event_sinks.ZaqarEventSinkTest.test_events[id-d0b72695-e97d-4aa1-bfaf-31c14b09ac87]: Zaqar is not presented in deployment.
+heat_tempest_plugin.tests.functional.test_software_config.ZaqarSignalTransportTest.test_signal_queues[id-3af97ced-bead-4629-b78a-97762719e990]: Zaqar is not presented in deployment.
+heat_tempest_plugin.tests.functional.test_waitcondition.ZaqarWaitConditionTest.test_signal_queues[id-90183f0d-9929-43a6-8fb6-b81003824c6d]: Zaqar is not presented in deployment.
+heat_tempest_plugin.tests.scenario.test_autoscaling_lbv2.AutoscalingLoadBalancerv2Test.test_autoscaling_loadbalancer_neutron[id-89459930-aa61-4557-989b-3429d3b3b612]: Not applicable for mcp deployments.
+heat_tempest_plugin.tests.scenario.test_volumes.VolumeBackupRestoreIntegrationTest.test_cinder_volume_create_backup_restore[id-c3416735-87bf-4478-85c5-b3823819eb19]: Not applicable for mcp deployments.
+heat_tempest_plugin.tests.functional.test_os_wait_condition.OSWaitCondition.test_create_stack_with_multi_signal_waitcondition[id-cc54ca6e-b91d-4ddd-80cc-24a886dfaaa0]: No applicable for mcp deployment.
+heat_tempest_plugin.tests.scenario.test_server_software_config.SoftwareConfigIntegrationTest.test_server_software_config[id-fb2afe23-d1a8-45fc-bf8d-b18fc8412972]: Not applicable.
+heat_tempest_plugin.tests.scenario.test_server_cfn_init.CfnInitIntegrationTest.test_server_cfn_init[id-3f7726fc-a41b-40ca-ab38-51e2973f146a]: Not applicable for mcp deployment.
+heat_tempest_plugin.tests.scenario.test_server_signal.ServerSignalIntegrationTest.test_server_signal_userdata_format_raw[id-8da0f6cc-60e6-4298-9e54-e1f905c5552a]: Not applicable for mcp deployment.
+heat_tempest_plugin.tests.scenario.test_server_signal.ServerSignalIntegrationTest.test_server_signal_userdata_format_software_config[id-3d753d42-7c16-4a0e-8f73-875881826626]: Not applicable for mcp deployment.
\ No newline at end of file
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index a49030f..525faee 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -6,12 +6,8 @@
 min_microversion = 2.1
 max_microversion = latest
 volume_device_name = vdc
-min_compute_nodes = 3
+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}
 
@@ -20,27 +16,27 @@
 
 # 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
+username = ${OS_USERNAME}
+admin_username = ${OS_USERNAME}
+admin_password = ${OS_PASSWORD}
+password = ${OS_PASSWORD}
+project_name = ${OS_TENANT_NAME}
+admin_project_name = ${OS_TENANT_NAME}
+region = ${OS_REGION_NAME}
+auth_version = 3
+auth_url = ${OS_AUTH_URL}
+project_domain_name = Default
+user_domain_name = Default
 endpoint_type = internal
-auth_url = http://10.0.0.0:5000/v2.0
-admin_password = aaa
-password = aaa
-disable_ssl_certificate_validation = True
-image_ref = ${IMAGE_REF2}
-minimal_image_ref = ${IMAGE_REF2}
 instance_type = m1.tiny
-network_for_ssh = net_name
-floating_network_name = net_name
-region = RegionOne
-fixed_network_name = ${FIXED_NET}
-fixed_subnet_name = subnet_name
 minimal_instance_type = m1.tiny
+network_for_ssh = ${PUBLIC_NET}
+floating_network_name = ${PUBLIC_NET}
+fixed_subnet_name = ${FIXED_SUBNET_NAME}
+disable_ssl_certificate_validation = True
+image_ref = ${IMAGE_NAME2}
+minimal_image_ref = ${IMAGE_NAME2}
+fixed_network_name = ${FIXED_NET}
 build_timeout = 180
 ssh_timeout = 30
 boot_config_env = /home/rally/boot_config_none_env.yaml
@@ -60,15 +56,19 @@
 [network]
 build_timeout = 120
 endpoint_type = publicURL
-public_network_id =
+# 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]
+[network-feature-enabled]
 port_security = true
 
 [validation]
-run_validation = False
+run_validation = false
 image_ssh_password = cubswin:)
 ssh_timeout = 130
+ping_timeout = 20
 
 [object-storage]
 container_sync_timeout = 120
@@ -78,11 +78,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
@@ -100,34 +95,3 @@
 api_v3 = true
 manage_snapshot = true
 backup = False
-
-[DEFAULT]
-lock_path = /tmp
-
-[dns]
-
-[heat_plugin]
-image_ref = <>
-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 = <>
-minimal_image_ref = <>
-instance_type = <>
-network_for_ssh = <>
-floating_network_name = <>
-region = <>
-fixed_network_name = <>
-fixed_subnet_name = <>
-minimal_instance_type = <>
-build_timeout = 180
-ssh_timeout = 30
-boot_config_env = /home/rally/boot_config_none_env.yaml
\ No newline at end of file