diff --git a/ansible/inventory/group_vars/all/pip b/ansible/inventory/group_vars/all/pip
index 928099ff3..8a9c90562 100644
--- a/ansible/inventory/group_vars/all/pip
+++ b/ansible/inventory/group_vars/all/pip
@@ -1,3 +1,3 @@
 ---
 # Upper constraints file for installation of python packages.
-pip_upper_constraints_file: "https://releases.openstack.org/constraints/upper/yoga"
+pip_upper_constraints_file: "https://releases.openstack.org/constraints/upper/{{ openstack_release }}"
diff --git a/dev/functions b/dev/functions
index 17c650b4d..3eda21475 100644
--- a/dev/functions
+++ b/dev/functions
@@ -72,8 +72,7 @@ function config_defaults {
     if [ -f "${PARENT}/../.gitreview" ]; then
       BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' "${PARENT}/../.gitreview")
       if [[ "${BRANCH}" == "" ]]; then
-       # TODO(priteau): Revert to master once we use Python 3.8+
-        SERIES="yoga"
+        SERIES="master"
       else
         SERIES="$(echo ${BRANCH} | sed 's|stable/||')"
       fi
diff --git a/dev/tenks-deploy-config-compute-libvirt-on-host.yml b/dev/tenks-deploy-config-compute-libvirt-on-host.yml
index 7e636c65f..d8cd1a14f 100644
--- a/dev/tenks-deploy-config-compute-libvirt-on-host.yml
+++ b/dev/tenks-deploy-config-compute-libvirt-on-host.yml
@@ -54,5 +54,3 @@ libvirt_vm_emulator: "{% if ansible_facts.os_family == 'RedHat' %}/usr/libexec/q
 # Specify a log path in the kolla_logs Docker volume. It is accessible on the
 # host at the same path.
 libvirt_vm_default_console_log_dir: "/var/log/kolla/tenks"
-
-python_upper_constraints_url: "https://releases.openstack.org/constraints/upper/yoga"
diff --git a/dev/tenks-deploy-config-compute.yml b/dev/tenks-deploy-config-compute.yml
index 79a4e073e..0f859ccd9 100644
--- a/dev/tenks-deploy-config-compute.yml
+++ b/dev/tenks-deploy-config-compute.yml
@@ -55,5 +55,3 @@ libvirt_vm_default_console_log_dir: "/var/log/kolla/tenks"
 # Console logs are owned by the ID of the Nova user in the nova_libvirt
 # container.
 libvirt_vm_log_owner: 42436
-
-python_upper_constraints_url: "https://releases.openstack.org/constraints/upper/yoga"
diff --git a/dev/tenks-deploy-config-overcloud.yml b/dev/tenks-deploy-config-overcloud.yml
index a3f0aa306..521f7d03a 100644
--- a/dev/tenks-deploy-config-overcloud.yml
+++ b/dev/tenks-deploy-config-overcloud.yml
@@ -42,5 +42,3 @@ wait_for_placement: false
 # Nested virtualisation is not working well in CI currently. Force the use of
 # QEMU.
 libvirt_vm_engine: "qemu"
-
-python_upper_constraints_url: "https://releases.openstack.org/constraints/upper/yoga"
diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml
index bf79cc05a..350b47dfd 100644
--- a/playbooks/kayobe-overcloud-base/run.yml
+++ b/playbooks/kayobe-overcloud-base/run.yml
@@ -5,7 +5,6 @@
     KAYOBE_OVERCLOUD_GENERATE_CERTIFICATES: "{{ tls_enabled | ternary(1, 0) }}"
     # TODO(mgoddard): Remove this when libvirt on host is used by default.
     TENKS_CONFIG_PATH: "dev/tenks-deploy-config-compute{% if tls_enabled %}-libvirt-on-host{% endif %}.yml"
-    UPPER_CONSTRAINTS_FILE: "https://releases.openstack.org/constraints/upper/yoga"
   tasks:
     - name: Ensure overcloud is deployed
       shell:
diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml
index b0be4a5a6..677b7c290 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/run.yml
+++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml
@@ -1,7 +1,5 @@
 ---
 - hosts: primary
-  environment:
-    UPPER_CONSTRAINTS_FILE: "https://releases.openstack.org/constraints/upper/yoga"
   tasks:
 
     # Install the previous release of Kayobe, and use it to deploy a control
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ea81dccce..366aa3f8d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -71,7 +71,6 @@
       - name: openstack/kolla
       - name: openstack/kolla-ansible
       - name: openstack/requirements
-        override-checkout: stable/yoga
       - name: openstack/tenks
     irrelevant-files:
       - ^\..+