diff --git a/.zuul.yaml b/.zuul.yaml
index 1c3bef2aa..9e424bec3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,7 +11,8 @@
       - openstack/devstack-gate
       - openstack/designate
       - openstack/designate-dashboard
-      - openstack/designate-tempest-plugin
+      - name: openstack/designate-tempest-plugin
+        override-checkout: 0.7.0
       - openstack/python-designateclient
       - openstack/tempest
     run: playbooks/legacy/designate-devstack-base/run.yaml
@@ -50,7 +51,8 @@
       - openstack/devstack-gate
       - openstack/designate
       - openstack/designate-dashboard
-      - openstack/designate-tempest-plugin
+      - name: openstack/designate-tempest-plugin
+        override-checkout: 0.7.0
       - openstack/python-designateclient
     run: playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
     post-run: playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index af6949f28..01a24888c 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -7,5 +7,8 @@ devstack_localrc target enable_plugin designate https://git.openstack.org/openst
 devstack_localrc base enable_service designate-api designate-central designate-producer designate-worker designate-mdns designate-agent designate-sink designate horizon
 devstack_localrc target enable_service designate-api designate-central designate-producer designate-worker designate-mdns designate-agent designate-sink designate horizon
 
+devstack_localrc base USE_PYTHON3=False
+devstack_localrc target USE_PYTHON3=False
+
 BASE_RUN_SMOKE=False
 TARGET_RUN_SMOKE=False