diff --git a/.gitignore b/.gitignore
index 05cbc5283..9ab04523f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ pip-log.txt
 *~
 .*.swp
 .*sw?
+.vscode/*
 
 # Files generated by Ansible
 ansible/*.retry
diff --git a/etc/kayobe/containers/pulp/post.yml b/etc/kayobe/containers/pulp/post.yml
index fdb5506cc..f2cb46e84 100644
--- a/etc/kayobe/containers/pulp/post.yml
+++ b/etc/kayobe/containers/pulp/post.yml
@@ -4,8 +4,8 @@
     url: "{{ pulp_url }}/pulp/api/v3/status/"
   register: pulp_status
   until: pulp_status is success
-  retries: 30
-  delay: 2
+  retries: "{{ pulp_timeout_retries | default(30) }}"
+  delay: "{{ pulp_timeout_delay | default(3) }}"
 
 - name: Set the Pulp admin password
   become: true
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 474dcd077..f5d21904e 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -116,10 +116,18 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
     reference: 1.3.0
+  cinder-base:
+    type: git
+    location: https://github.com/stackhpc/cinder.git
+    reference: stackhpc/{{ openstack_release }}
   cloudkitty-base:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
     reference: stackhpc/{{ openstack_release }}
+  glance-base:
+    type: git
+    location: https://github.com/stackhpc/glance.git
+    reference: stackhpc/{{ openstack_release }}
   horizon-plugin-cloudkitty-dashboard:
     type: git
     location: https://github.com/stackhpc/cloudkitty-dashboard.git
@@ -141,6 +149,10 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
     reference: stackhpc/{{ openstack_release }}
+  nova-base:
+    type: git
+    location: https://github.com/stackhpc/nova.git
+    reference: stackhpc/{{ openstack_release }}
 
 ###############################################################################
 # Kolla image build configuration.
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 021bcab21..1a83ffe56 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -9,14 +9,20 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts
 
 {% if kolla_base_distro == 'centos' %}
 bifrost_tag: yoga-20221007T134036
+cinder_tag: yoga-20230125T113143
+glance_tag: yoga-20230125T113143
 magnum_tag: yoga-20230110T142129
 neutron_tag: yoga-20230104T155323
+nova_tag: yoga-20230125T113143
 ovn_tag: yoga-20230119T125748
 prometheus_openstack_exporter_tag: yoga-20221128T164623
 {% else %}
 bifrost_tag: yoga-20221215T142947
+cinder_tag: yoga-20230125T114437
+glance_tag: yoga-20230125T114437
 magnum_tag: yoga-20230110T144737
 neutron_tag: yoga-20230104T163118
+nova_tag: yoga-20230125T114437
 {% endif %}
 
 om_enable_rabbitmq_high_availability: true