diff --git a/playbooks/kayobe-base/pre.yml b/playbooks/kayobe-base/pre.yml
index 18f7b1527..ce5d5e037 100644
--- a/playbooks/kayobe-base/pre.yml
+++ b/playbooks/kayobe-base/pre.yml
@@ -91,6 +91,15 @@
           command: >-
             git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
 
+        - name: Ensure previous kolla-ansible directory exists
+          file:
+            path: "{{ previous_kolla_ansible_src_dir }}"
+            state: directory
+
+        - name: Ensure previous kolla-ansible repository is cloned
+          command: >-
+            git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }}
+
         - name: Ensure previous kayobe is executed in verbose mode
           lineinfile:
             path: "{{ previous_kayobe_src_dir }}/dev/config.sh"
@@ -103,8 +112,7 @@
           vars:
             kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
             kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
-          # TODO(mgoddard): Always do this when previous release is Yoga.
-          when: previous_release != 'xena'
+          when: previous_release == 'yoga'
 
         - name: Update kolla-ansible requirements.yml
           include_role:
@@ -113,7 +121,6 @@
             kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
             kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
             kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
-          # TODO(mgoddard): Always do this when previous release is Yoga.
-          when: previous_release != 'xena'
+          when: previous_release == 'yoga'
 
       when: is_upgrade
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6d2c63ee8..36e734642 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -88,7 +88,7 @@
       - ^zuul.d/.*
     vars:
       # Name of the release to upgrade from for upgrade jobs.
-      previous_release: xena
+      previous_release: yoga
       logs_dir: "/tmp/logs"
       ansible_collection_kolla_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/ansible-collection-kolla'].src_dir }}"
       kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe'].src_dir }}"
@@ -96,6 +96,7 @@
       kolla_ansible_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
       previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}"
       previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
+      previous_kolla_ansible_src_dir: "{{ ansible_env.PWD ~ '/previous/kolla-ansible' }}"
       requirements_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir }}"
       tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
       is_upgrade: "{{ 'upgrade' in zuul.job }}"