diff --git a/Dockerfile b/Dockerfile
index 7b9b4fd..5efc555 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 
 USER root
 
-RUN apt-get update; apt-get install -y inetutils-ping curl wget
+RUN apt-get update; apt-get install -y iputils-ping curl wget
 
 WORKDIR /var/lib/
 
diff --git a/cleanup.sh b/cleanup.sh
index 15e7ef9..05d154f 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -3,6 +3,7 @@
 mask='rally_\|tempest_\|tempest-'
 dry_run=false
 clean_projects=false
+make_servers_active=false
 
 function show_help {
     printf "Resource cleaning script\nMask is: %s\n\t-h, -?\tShow this help\n\t-t\tDry run mode, no cleaning done\n\t-P\tForce cleaning of projects\n" ${mask}
@@ -18,6 +19,9 @@
     t)  dry_run=true
         printf "Running in dry-run mode\n"
         ;;
+    S)  make_servers_active=true
+        printf "Servers will be set to ACTIVE before deletion\n"
+        ;;
     P)  clean_projects=true
         printf "Project cleanning enabled\n"
         ;;
@@ -34,7 +38,7 @@
     fi
     if [ -s ${cmds} ]; then
         echo "Processing $(cat ${cmds} | wc -l) commands"
-        #cat ${cmds} | openstack
+        cat ${cmds} | openstack
         truncate -s 0 ${cmds}
     fi
 }
@@ -67,6 +71,9 @@
 function _clean_servers {
     servers=( $(openstack server list --name ${mask} -c ID -f value) )
     echo "-> ${#servers[@]} servers containing '${mask}' found"
+    if [ "$make_servers_active" = true ]; then
+        printf "%s\n" ${servers[@]} | xargs -I{} echo server set --state active {} >>${cmds}
+    fi
     printf "%s\n" ${servers[@]} | xargs -I{} echo server delete {} >>${cmds}
     _clean_and_flush
 }
diff --git a/configure.sh b/configure.sh
index a315ca9..590a4d6 100755
--- a/configure.sh
+++ b/configure.sh
@@ -45,9 +45,10 @@
     if [ -n "${PROXY}" ]; then
       export https_proxy=$PROXY
     fi
+    apt-get update; apt-get install -y iputils-ping curl wget
     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
+    rally verify add-verifier-ext --version 7a4bff728fbd8629ec211669264ab645aa921e2b --source https://github.com/openstack/telemetry-tempest-plugin
+    rally verify add-verifier-ext --version 12b770e923060f5ef41358c37390a25be56634f0 --source https://github.com/openstack/heat-tempest-plugin
     pip install --force-reinstall python-cinderclient==3.2.0
     unset https_proxy
   fi
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index 151ee19..856f443 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -60,7 +60,7 @@
 build_timeout = 120
 endpoint_type = publicURL
 
-[network_feature_enabled]
+[network-feature-enabled]
 port_security = true
 
 [validation]