diff --git a/extra/pre-build.sh b/extra/pre-build.sh
index 30c122c..29aa4e1 100755
--- a/extra/pre-build.sh
+++ b/extra/pre-build.sh
@@ -17,20 +17,20 @@
 #export RELEASE_BUILD=${RELEASE_BUILD:-true}
 RELEASE_BUILD=false
 #
-export TEMPEST_TAG="${TEMPEST_TAG:-mcp/queens}"
-export HORIZON_TAG="${HORIZON_TAG:-mcp/queens}"
-export BARBICAN_TAG="${BARBICAN_TAG:-mcp/queens}"
-export DESIGNATE_TAG="${DESIGNATE_TAG:-mcp/queens}"
-export HEAT_TAG="${HEAT_TAG:-mcp/queens}"
-export IRONIC_TAG="${IRONIC_TAG:-mcp/queens}"
-export MANILA_TAG="${MANILA_TAG:-mcp/queens}"
-export TELEMETRY_TAG="${TELEMETRY_TAG:-mcp/queens}"
-export OCTAVIA_TAG="${OCTAVIA_TAG:-mcp/queens}"
+export TEMPEST_TAG="${TEMPEST_TAG:-mcp/xenial/rocky}"
+export HORIZON_TAG="${HORIZON_TAG:-mcp/xenial/rocky}"
+export BARBICAN_TAG="${BARBICAN_TAG:-mcp/xenial/rocky}"
+export DESIGNATE_TAG="${DESIGNATE_TAG:-mcp/xenial/rocky}"
+export HEAT_TAG="${HEAT_TAG:-mcp/xenial/rocky}"
+export IRONIC_TAG="${IRONIC_TAG:-mcp/xenial/rocky}"
+export MANILA_TAG="${MANILA_TAG:-mcp/xenial/rocky}"
+export TELEMETRY_TAG="${TELEMETRY_TAG:-mcp/xenial/rocky}"
+export OCTAVIA_TAG="${OCTAVIA_TAG:-mcp/xenial/rocky}"
 export PATROLE_TAG="${PATROLE_TAG:-0.4.x}"
 export TUNGSTEN_TAG="${TUNGSTEN_TAG:-0.1.x}"
 # global openstack requirements repo
-# This is the commit where tempest version is 18.0.0 in u-c
-export UPPER_CONSTRAINTS_TAG="${UPPER_CONSTRAINTS_TAG:-6e64e622e8608ab817dbc809d99e02e4cfdd9f59}"
+# This is the commit where tempest version is 19.0.0 in u-c
+export UPPER_CONSTRAINTS_TAG="${UPPER_CONSTRAINTS_TAG:-2fcead2a79ef38c29b5aad0843a8174ef938545f}"
 
 function prepare(){
   # TODO migrate to downstrem mirror?