diff --git a/Dockerfile b/Dockerfile
index 4c8fcab..98bc990 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,18 +2,18 @@
 
 LABEL maintainer="qa@mirantis.com"
 
-ARG TEMPEST_TAG="mcp/pike"
+ARG TEMPEST_TAG="mcp/queens"
 # Tempest plugins
-ARG HORIZON_TAG="mcp/pike"
-ARG BARBICAN_TAG="mcp/pike"
-ARG DESIGNATE_TAG="mcp/pike"
-ARG HEAT_TAG="mcp/pike"
-ARG IRONIC_TAG="mcp/pike"
-ARG MANILA_TAG="mcp/pike"
-ARG TELEMETRY_TAG="mcp/pike"
+ARG HORIZON_TAG="mcp/queens"
+ARG BARBICAN_TAG="mcp/queens"
+ARG DESIGNATE_TAG="mcp/queens"
+ARG HEAT_TAG="mcp/queens"
+ARG IRONIC_TAG="mcp/queens"
+ARG MANILA_TAG="mcp/queens"
+ARG TELEMETRY_TAG="mcp/queens"
 # global openstack requirements repo
-# This is the commit where tempest version is 17.2.0 in u-c
-ARG UPPER_CONSTRAINTS_TAG="83b1de74834fbcdbe749e270c29e76cdc28f85d5"
+# This is the commit where tempest version is 18.0.0 in u-c
+ARG UPPER_CONSTRAINTS_TAG="6e64e622e8608ab817dbc809d99e02e4cfdd9f59"
 #
 ENV DEBIAN_FRONTEND=noninteractive \
     DEBCONF_NONINTERACTIVE_SEEN=true \
@@ -39,7 +39,7 @@
 RUN git clone https://github.com/openstack/requirements.git openstack_requirements && \
     pushd openstack_requirements; git checkout $UPPER_CONSTRAINTS_TAG; popd ;
 
-RUN sed -i -e 's|tempest===17.2.0|git+https://gerrit.mcp.mirantis.net/packaging/sources/tempest@mcp/pike#egg=tempest|g' \
+RUN sed -i -e 's|tempest===18.0.0|git+https://gerrit.mcp.mirantis.net/packaging/sources/tempest@mcp/queens#egg=tempest|g' \
     /var/lib/openstack_requirements/upper-constraints.txt;
 
 RUN git clone https://gerrit.mcp.mirantis.net/packaging/sources/tempest-horizon tempest-horizon-plugin ; \
@@ -89,7 +89,8 @@
 
 # Patch os_testr library to fix issue ralated with tempest black-list option
 COPY bin/patches/regex_builder.patch /tmp/regex_builder.patch
-RUN patch /usr/local/lib/python2.7/dist-packages/os_testr/regex_builder.py /tmp/regex_builder.patch
+#TODO: investigate how to add skiplist without os-testr
+#RUN patch /usr/local/lib/python2.7/dist-packages/os_testr/regex_builder.py /tmp/regex_builder.patch
 
 # Cleanup.
 RUN apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6 \
diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
index 18c8d80..3c9b695 100755
--- a/bin/entrypoint.sh
+++ b/bin/entrypoint.sh
@@ -3,6 +3,7 @@
 set -xe
 
 function _info(){
+  echo -e "=== INFO: PIKE"
   set +x
   echo -e "=== INFO: tempest version:"
   tempest --version