diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 91d71172d..c30ccb09d 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -7,7 +7,9 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
 bifrost_tag: wallaby-20220921T100954
 cinder_tag: wallaby-20230125T101644
 glance_tag: wallaby-20230125T101644
+glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
 magnum_tag: wallaby-20230111T101726
+neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
 nova_tag: wallaby-20230125T101644
 rabbitmq_tag: wallaby-20221205T160115
 {% else %}
@@ -15,10 +17,11 @@ bifrost_tag: wallaby-20220825T112231
 cinder_tag: wallaby-20230125T132411
 cloudkitty_tag: wallaby-20221215T220154
 glance_tag: wallaby-20230125T132411
+glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
 kolla_toolbox_tag: wallaby-20221222T161624
 magnum_tag: wallaby-20230111T103759
 neutron_tag: wallaby-20221222T161624
-neutron_tls_proxy_tag: "{% raw %}{{ openstack_tag }}{% endraw %}"
+neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
 nova_tag: wallaby-20230125T132411
 octavia_tag: wallaby-20221222T161624
 openvswitch_tag: wallaby-20221222T161624