diff --git a/Dockerfile b/Dockerfile
index 835c3a9..bbabdf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,9 @@
 RUN pip install --force-reinstall python-cinderclient==3.2.0 python-glanceclient==2.11
 
 RUN sed -i 's/length=15/length=32/g' /var/lib/tempest/tempest/lib/common/utils/data_utils.py
-RUN sed -i 's/uuid4()/uuid4().replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/scenarios/keystone/utils.py
-RUN sed -i 's/uuid4()/uuid4().replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/context/keystone/users.py
+RUN sed -i 's/length=15/length=32/g' /usr/local/lib/python2.7/dist-packages/tempest/lib/common/utils/data_utils.py
+RUN sed -i 's/uuid4())/uuid4()).replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/scenarios/keystone/utils.py
+RUN sed -i 's/uuid4())/uuid4()).replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/context/keystone/users.py
 
 COPY rally/ /var/lib/cvp-configuration/rally
 COPY tempest/ /var/lib/cvp-configuration/tempest
diff --git a/configure.sh b/configure.sh
index f53012e..7d37f6a 100755
--- a/configure.sh
+++ b/configure.sh
@@ -31,8 +31,8 @@
   fi
   sub_name=`date "+%H_%M_%S"`
   # remove dashes from rally user passwords to fit into 32 char limit
-  sed -i 's/uuid4()/uuid4().replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/scenarios/keystone/utils.py
-  sed -i 's/uuid4()/uuid4().replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/context/keystone/users.py
+  sed -i 's/uuid4())/uuid4()).replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/scenarios/keystone/utils.py
+  sed -i 's/uuid4())/uuid4()).replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/context/keystone/users.py
   rally deployment create --fromenv --name=tempest_$sub_name
   rally deployment config
   echo "[openstack]" >> /etc/rally/rally.conf
@@ -100,10 +100,13 @@
   neutron net-create --shared fixed-net
   neutron subnet-create --name fixed-subnet --gateway 192.168.0.1 --allocation-pool start=192.168.0.2,end=192.168.0.254 --ip-version 4 fixed-net 192.168.0.0/24
 fi
+# public/floating net
+PUBLIC_NET=$(neutron net-list -c name -c router:external | grep True | awk '{print $2}' | tail -n 1)
 FIXED_NET=$(neutron net-list -c name -c shared | grep "fixed-net" | grep True | awk '{print $2}' | tail -n 1)
 FIXED_NET_ID=$(neutron net-list -c id -c name -c shared | grep "fixed-net" | grep True | awk '{print $2}' | tail -n 1)
 FIXED_SUBNET_ID=$(neutron net-show $FIXED_NET_ID -c subnets | grep subnets | awk '{print $4}')
 FIXED_SUBNET_NAME=$(neutron subnet-show -c name $FIXED_SUBNET_ID | grep name | awk '{print $4}')
+echo "Public net name is $PUBLIC_NET"
 echo "Fixed net name is $FIXED_NET, id is $FIXED_NET_ID"
 echo "Fixed subnet is: $FIXED_SUBNET_ID, name: $FIXED_SUBNET_NAME"
 sed -i 's/${IMAGE_REF2}/'$IMAGE_REF2'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
@@ -118,10 +121,14 @@
 sed -i 's/${OS_REGION_NAME}/'$OS_REGION_NAME'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's|${OS_AUTH_URL}|'"${OS_AUTH_URL}"'|g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's|${OS_PASSWORD}|'"${OS_PASSWORD}"'|g' $current_path/cvp-configuration/tempest/tempest_ext.conf
+sed -i 's|${PUBLIC_NET}|'"${PUBLIC_NET}"'|g' $current_path/cvp-configuration/tempest/tempest_ext.conf
+sed -i 's|${PUBLIC_NET}|'"${PUBLIC_NET}"'|g' $current_path/cvp-configuration/rally/rally_scenarios_fip_and_ubuntu.json
+sed -i 's|${PUBLIC_NET}|'"${PUBLIC_NET}"'|g' $current_path/cvp-configuration/rally/rally_scenarios_fip_and_ubuntu_100.json
 sed -i 's/publicURL/'$TEMPEST_ENDPOINT_TYPE'/g' $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
+cp $current_path/cvp-configuration/rally/instance_test.sh /home/rally/instance_test.sh
 cp $current_path/cvp-configuration/cleanup.sh /home/rally/cleanup.sh
 chmod 755 /home/rally/cleanup.sh
 }
@@ -142,8 +149,8 @@
     # If you do not have fip network, use this command
     #cat $current_path/cvp-configuration/tempest/skip-list-fip-only.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
     # If Opencontrail is deployed, use this command
-    cat $current_path/cvp-configuration/tempest/skip-list-oc4.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
-    cat $current_path/cvp-configuration/tempest/skip-list-heat.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
+    #cat $current_path/cvp-configuration/tempest/skip-list-oc4.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
+    #cat $current_path/cvp-configuration/tempest/skip-list-heat.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
     rally verify configure-verifier --extend $current_path/cvp-configuration/tempest/tempest_ext.conf
     rally verify configure-verifier --show
     # If Barbican tempest plugin is installed, use this
diff --git a/rally/rally_scenarios.json b/rally/rally_scenarios.json
index a0f169e..4e02e57 100644
--- a/rally/rally_scenarios.json
+++ b/rally/rally_scenarios.json
@@ -1,6 +1,5 @@
 {% set flavor_name = flavor_name or "m1.tiny" %}
 {% set image_name = image_name or "testvm" %}
-{% set volume_type = volume_type or "default" %}
 {% set availability_zone = "nova" %}
 {% set concurrency = 1 %}
 {% set volume_size = 1 %}
@@ -8,9 +7,8 @@
 {% set users = 1 %}
 {% set tenants = 1 %}
 {% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/home/rally/source/cvp-configuration/rally/default.yaml.template" %}
+{% set heat_template = "/home/rally/boot_config_none_env.yaml" %}
 {% set fixed_net = "${FIXED_NET}" %}
-{% set block_migration = true %}
 {
   "KeystoneBasic.authenticate_user_and_validate_token": [
   {
@@ -157,44 +155,6 @@
     "sla": { "failure_rate": { "max": 0 } }
   }
   ],
-  "NovaServers.boot_and_live_migrate_server": [
-  {
-    "args": {
-      "flavor": {
-        "name": "{{flavor_name}}"
-      },
-      "image": {
-        "name": "{{image_name}}"
-      },
-      "nics": [
-        {"net-id": "{{fixed_net}}"}
-      ],
-      "block_migration": {{block_migration}}
-    },
-    "runner": {
-      "type": "constant",
-      "concurrency": {{concurrency}},
-      "times": {{times}}
-    },
-    "context": {
-      "users": {
-        "users_per_tenant": {{users}},
-        "tenants": {{tenants}}
-      },
-      "quotas": {
-        "nova": {
-          "instances": -1,
-          "cores": -1,
-          "ram": -1,
-          "key_pairs": -1,
-          "security_groups": -1,
-          "security_group_rules": -1
-        }
-      }
-    },
-    "sla": { "failure_rate": { "max": 0 } }
-  }
-  ],
   "NovaServers.boot_and_delete_server": [
   {
     "args": {
@@ -247,7 +207,6 @@
         {"net-id": "{{fixed_net}}"}
       ],
       "volume_size": {{volume_size}},
-      "volume_type": "{{volume_type}}",
       "force_delete": false,
       "availability_zone": "{{availability_zone}}"
     },
diff --git a/rally/rally_scenarios_100.json b/rally/rally_scenarios_100.json
index d522bdd..4c3ba62 100644
--- a/rally/rally_scenarios_100.json
+++ b/rally/rally_scenarios_100.json
@@ -1,6 +1,5 @@
 {% set flavor_name = flavor_name or "m1.tiny" %}
 {% set image_name = image_name or "testvm" %}
-{% set volume_type = volume_type or "default" %}
 {% set availability_zone = "nova" %}
 {% set concurrency = 10 %}
 {% set volume_size = 1 %}
@@ -8,9 +7,8 @@
 {% set users = 3 %}
 {% set tenants = 3 %}
 {% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/home/rally/source/cvp-configuration/rally/default.yaml.template" %}
+{% set heat_template = "/home/rally/boot_config_none_env.yaml" %}
 {% set fixed_net = "${FIXED_NET}" %}
-{% set block_migration = true %}
 {
   "KeystoneBasic.authenticate_user_and_validate_token": [
   {
@@ -157,44 +155,6 @@
     "sla": { "failure_rate": { "max": 0 } }
   }
   ],
-  "NovaServers.boot_and_live_migrate_server": [
-  {
-    "args": {
-      "flavor": {
-        "name": "{{flavor_name}}"
-      },
-      "image": {
-        "name": "{{image_name}}"
-      },
-      "nics": [
-        {"net-id": "{{fixed_net}}"}
-      ],
-      "block_migration": {{block_migration}}
-    },
-    "runner": {
-      "type": "constant",
-      "concurrency": {{concurrency}},
-      "times": {{times}}
-    },
-    "context": {
-      "users": {
-        "users_per_tenant": {{users}},
-        "tenants": {{tenants}}
-      },
-      "quotas": {
-        "nova": {
-          "instances": -1,
-          "cores": -1,
-          "ram": -1,
-          "key_pairs": -1,
-          "security_groups": -1,
-          "security_group_rules": -1
-        }
-      }
-    },
-    "sla": { "failure_rate": { "max": 0 } }
-  }
-  ],
   "NovaServers.boot_and_delete_server": [
   {
     "args": {
@@ -247,7 +207,6 @@
         {"net-id": "{{fixed_net}}"}
       ],
       "volume_size": {{volume_size}},
-      "volume_type": "{{volume_type}}",
       "force_delete": false,
       "availability_zone": "{{availability_zone}}"
     },
diff --git a/rally/rally_scenarios_fip_and_ubuntu.json b/rally/rally_scenarios_fip_and_ubuntu.json
index 7782a3a..153a615 100644
--- a/rally/rally_scenarios_fip_and_ubuntu.json
+++ b/rally/rally_scenarios_fip_and_ubuntu.json
@@ -7,9 +7,10 @@
 {% set times = 1 %}
 {% set users = 1 %}
 {% set tenants = 1 %}
-{% set ext_net_id = "<PUT_ID_HERE>" %}
+{% set ext_net_id = "${PUBLIC_NET}" %}
 {% set fixed_net = "${FIXED_NET}" %}
-{% set script_file = script_file or "/home/rally/source/cvp-configuration/rally/instance_test.sh" %}
+{% set script_file = script_file or "/home/rally/instance_test.sh" %}
+{% set block_migration = false %}
 {
   "VMTasks.boot_runcommand_delete": [
   {
@@ -132,5 +133,43 @@
     },
     "sla": { "failure_rate": { "max": 0 } }
   }
+  ],
+  "NovaServers.boot_and_live_migrate_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
+      "image": {
+        "name": "{{image_name}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ],
+      "block_migration": {{block_migration}}
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      },
+      "quotas": {
+        "nova": {
+          "instances": -1,
+          "cores": -1,
+          "ram": -1,
+          "key_pairs": -1,
+          "security_groups": -1,
+          "security_group_rules": -1
+        }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
   ]
 }
diff --git a/rally/rally_scenarios_fip_and_ubuntu_100.json b/rally/rally_scenarios_fip_and_ubuntu_100.json
index 6c3a05d..2e6f7b9 100644
--- a/rally/rally_scenarios_fip_and_ubuntu_100.json
+++ b/rally/rally_scenarios_fip_and_ubuntu_100.json
@@ -7,9 +7,10 @@
 {% set times = 100 %}
 {% set users = 3 %}
 {% set tenants = 3 %}
-{% set ext_net_id = "<PUT_ID_HERE>" %}
+{% set ext_net_id = "${PUBLIC_NET}" %}
 {% set fixed_net = "${FIXED_NET}" %}
-{% set script_file = script_file or "/home/rally/source/cvp-configuration/rally/instance_test.sh" %}
+{% set script_file = script_file or "/home/rally/instance_test.sh" %}
+{% set block_migration = false %}
 {
   "VMTasks.boot_runcommand_delete": [
   {
@@ -132,5 +133,43 @@
     },
     "sla": { "failure_rate": { "max": 0 } }
   }
+  ],
+  "NovaServers.boot_and_live_migrate_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
+      "image": {
+        "name": "{{image_name}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ],
+      "block_migration": {{block_migration}}
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      },
+      "quotas": {
+        "nova": {
+          "instances": -1,
+          "cores": -1,
+          "ram": -1,
+          "key_pairs": -1,
+          "security_groups": -1,
+          "security_group_rules": -1
+        }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
   ]
 }
diff --git a/tempest/skip-list-queens.yaml b/tempest/skip-list-queens.yaml
index 74e1cc8..a37f772 100644
--- a/tempest/skip-list-queens.yaml
+++ b/tempest/skip-list-queens.yaml
@@ -1,6 +1,2 @@
-tempest.api.compute.servers.test_servers.ServersTestJSON.test_create_server_specify_multibyte_character_name[id-defbaca5-d611-49f5-ae21-56ee25d2db49]: PROD-28077
 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.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_create_list_show_delete_interfaces_by_fixed_ip[id-d290c06c-f5b3-11e7-8ec8-002293781009,network]: Tempest test problem. Fixed in Tempest 20.
-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. After microversion 2.36 os-networks nova api extension used in this tests is deprecated.
-tempest.api.compute.admin.test_server_diagnostics.ServerDiagnosticsV248Test.test_get_server_diagnostics[id-64d0d48c-dff1-11e6-bf01-fe55135034f3]: cannot be verified. 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. After microversion 2.36 os-networks nova api extension used in this tests is deprecated.
diff --git a/tempest/skip-list.yaml b/tempest/skip-list.yaml
index 74e1cc8..26865ef 100644
--- a/tempest/skip-list.yaml
+++ b/tempest/skip-list.yaml
@@ -1,6 +1,12 @@
-tempest.api.compute.servers.test_servers.ServersTestJSON.test_create_server_specify_multibyte_character_name[id-defbaca5-d611-49f5-ae21-56ee25d2db49]: PROD-28077
-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.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_create_list_show_delete_interfaces_by_fixed_ip[id-d290c06c-f5b3-11e7-8ec8-002293781009,network]: Tempest test problem. Fixed in Tempest 20.
-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. After microversion 2.36 os-networks nova api extension used in this tests is deprecated.
-tempest.api.compute.admin.test_server_diagnostics.ServerDiagnosticsV248Test.test_get_server_diagnostics[id-64d0d48c-dff1-11e6-bf01-fe55135034f3]: cannot be verified. 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. After microversion 2.36 os-networks nova api extension used in this tests is deprecated.
+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.
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index d4777f2..cc28635 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -26,8 +26,8 @@
 endpoint_type = internal
 instance_type = m1.tiny
 minimal_instance_type = m1.tiny
-network_for_ssh = net_name
-floating_network_name = net_name
+network_for_ssh = ${PUBLIC_NET}
+floating_network_name = ${PUBLIC_NET}
 fixed_subnet_name = ${FIXED_SUBNET_NAME}
 disable_ssl_certificate_validation = True
 image_ref = ${IMAGE_REF2}