diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack
index e22c94f1a..86bf653e7 100644
--- a/ansible/group_vars/all/openstack
+++ b/ansible/group_vars/all/openstack
@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "train".
-openstack_release: "train"
+# Name of the current OpenStack release. Default is "master".
+openstack_release: "master"
 
-# Name of the current OpenStack branch. Default is "stable/train".
+# Name of the current OpenStack branch. Default is "master".
 openstack_branch: >-
   {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
 
diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml
index e00a51c33..206e2646d 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -21,7 +21,7 @@ kolla_ansible_venv_python: "python{{ kolla_ansible_venv_python_major_version }}"
 
 # Major version of Python interpreter used in Kolla Ansible virtualenv.
 # FIXME(mgoddard): Use ansible_python when Kayobe supports Python 3.
-kolla_ansible_venv_python_major_version: 2
+kolla_ansible_venv_python_major_version: 3
 
 # Virtualenv directory where Kolla-ansible's ansible modules will execute
 # remotely on the target nodes. If None, no virtualenv will be used.
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index b2ad4e976..1acfd0756 100644
--- a/etc/kayobe/openstack.yml
+++ b/etc/kayobe/openstack.yml
@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "train".
+# Name of the current OpenStack release. Default is "master".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/train".
+# Name of the current OpenStack branch. Default is "master".
 #openstack_branch:
 
 ###############################################################################
diff --git a/tox.ini b/tox.ini
index c83668eda..b90a48436 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ setenv =
    OS_STDERR_CAPTURE=1
    OS_TEST_TIMEOUT=60
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
@@ -27,7 +27,7 @@ commands = stestr run {posargs}
 [testenv:pep8]
 # sphinx8 needs the sphinx package which is required via doc/requirements.txt
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
     -r{toxinidir}/test-requirements.txt
@@ -42,7 +42,7 @@ commands =
 
 [testenv:venv]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
@@ -64,7 +64,7 @@ commands =
 
 [testenv:molecule]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 whitelist_externals =
@@ -113,7 +113,7 @@ commands =
 
 [testenv:docs]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
@@ -133,7 +133,7 @@ commands = oslo_debug_helper {posargs}
 
 [testenv:releasenotes]
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index bea8e5e0e..e88920c35 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -58,14 +58,8 @@
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
-        # TODO(mgoddard): Remove when Ansible playbooks support Python 3.
-        override-checkout: stable/train
       - name: openstack/kolla-ansible
-        # TODO(mgoddard): Remove when Ansible playbooks support Python 3.
-        override-checkout: stable/train
       - name: openstack/requirements
-        # TODO(mgoddard): Remove when Ansible playbooks support Python 3.
-        override-checkout: stable/train
       - name: openstack/tenks
     irrelevant-files:
       - ^.*\.rst$