diff --git a/.gitignore b/.gitignore
index 713cead5c..17cbc4fe2 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/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index 0fce89039..5c467eb7f 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -12,6 +12,7 @@ kolla_enable_cinder: true
 kolla_enable_cloudkitty: true
 kolla_enable_designate: true
 kolla_enable_elasticsearch_curator: true
+kolla_enable_etcd: true
 kolla_enable_grafana: true
 kolla_enable_influxdb: true
 kolla_enable_ironic: true
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index e3ab11dd8..3c8da1249 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -120,10 +120,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/xena
+  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/xena
+  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 d41270440..22e4fcc2a 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -9,16 +9,25 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts
 
 {% if kolla_base_distro == 'centos' %}
 bifrost_tag: xena-20221128T101757
+cinder_tag: xena-20230206T165215
+etcd_tag: xena-20230201T095253
+glance_tag: xena-20230206T165215
+glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
 magnum_tag: xena-20230131T144233
-nova_tag: xena-20230120T115956
+neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
+nova_tag: xena-20230206T165215
 rabbitmq_tag: xena-20230105T141714
 {% else %}
 bifrost_tag: xena-20221213T224057
+cinder_tag: xena-20230206T165220
+etcd_tag: xena-20230201T131415
+glance_tag: xena-20230206T165220
+glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
 kolla_toolbox_tag: xena-20230104T145414
 magnum_tag: xena-20230131T151601
 neutron_tag: xena-20230104T145414
-neutron_tls_proxy_tag: "{% raw %}{{ openstack_tag }}{% endraw %}"
-nova_tag: xena-20230104T145414
+neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
+nova_tag: xena-20230206T165220
 octavia_tag: xena-20230104T145414
 openvswitch_tag: xena-20230104T145414
 ovn_tag: xena-20230104T145414
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 61f7c4dba..115a25472 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -482,6 +482,7 @@ stackhpc_pulp_images_kolla:
   - dnsmasq
   - elasticsearch
   - elasticsearch-curator
+  - etcd
   - fluentd
   - glance-api
   - grafana
diff --git a/releasenotes/notes/etcd-e4927551bf5d020c.yaml b/releasenotes/notes/etcd-e4927551bf5d020c.yaml
new file mode 100644
index 000000000..93b6344a6
--- /dev/null
+++ b/releasenotes/notes/etcd-e4927551bf5d020c.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Adds an ``etcd`` Kolla container image. This can be used for OpenStack
+    service coordination as a tooz backend, or for batched processing of switch
+    configuration in Networking Generic Switch (this requires a downstream NGS
+    patch).