diff --git a/Dockerfile b/Dockerfile
index 7b9b4fd..1b28a0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,25 +4,30 @@
 
 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/
 
 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; \
+    pushd tempest; git checkout 17.2.0; \
+    sed -i 's/length=15/length=32/g' /var/lib/tempest/tempest/lib/common/utils/data_utils.py; \
+    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; \
     popd;
 
-RUN git clone https://github.com/openstack/heat-tempest-plugin && \
-    pushd heat-tempest-plugin; git checkout 12b770e923060f5ef41358c37390a25be56634f0; pip install -r requirements.txt; \
+RUN git clone https://gerrit.mcp.mirantis.com/packaging/sources/heat-tempest-plugin && \
+    pushd heat-tempest-plugin; git checkout mcp/ocata; 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
+
+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