-UPSTREAM_RDO = 'https://images.rdoproject.org/master/delorean/current' \
- '-tripleo-rdo/'
-OPENSTACK_GERRIT = 'https://review.openstack.org'
+RDO_TAG = 'current-tripleo'
+UPSTREAM_RDO = "https://images.rdoproject.org/master/rdo_trunk/{}/".format(
+ RDO_TAG)
+OPENSTACK_GERRIT = 'https://review.opendev.org'