diff --git a/all/002-images-kolla.yml b/all/002-images-kolla.yml
index 5a92f22..8b578b5 100644
--- a/all/002-images-kolla.yml
+++ b/all/002-images-kolla.yml
@@ -131,7 +131,7 @@ keystone_fernet_tag: "{{ keystone_tag }}"
 keystone_ssh_image: "{{ docker_image_url }}keystone-ssh"
 keystone_ssh_tag: "{{ keystone_tag }}"
 keystone_httpd_image: "{{ docker_image_url }}httpd"
-keystone_httpd_tag: "{{ keystone_tag }}"
+keystone_httpd_tag: "{{ kolla_httpd_version|default(kolla_image_version) }}"
 
 ##############################
 # role: mariadb
@@ -176,7 +176,7 @@ cinder_api_tag: "{{ cinder_tag }}"
 
 hacluster_tag: "{{ kolla_hacluster_version|default(kolla_image_version) }}"
 hacluster_corosync_image: "{{ docker_image_url }}hacluster-corosync"
-hacluster_corosync_tag: "{{ hacluster_tag }}"
+hacluster_corosync_tag: "{{ kolla_hacluster_corosync_version|default(hacluster_tag) }}"
 hacluster_pacemaker_image: "{{ docker_image_url }}hacluster-pacemaker"
 hacluster_pacemaker_tag: "{{ hacluster_tag }}"
 hacluster_pacemaker_remote_image: "{{ docker_image_url }}hacluster-pacemaker-remote"
@@ -290,6 +290,10 @@ prometheus_blackbox_exporter_image: "{{ docker_image_url }}prometheus-blackbox-e
 prometheus_blackbox_exporter_tag: "{{ kolla_prometheus_blackbox_exporter_version|default(prometheus_tag) }}"
 prometheus_libvirt_exporter_image: "{{ docker_image_url }}prometheus-libvirt-exporter"
 prometheus_libvirt_exporter_tag: "{{ kolla_prometheus_libvirt_exporter_version|default(prometheus_tag) }}"
+prometheus_openstack_network_exporter_image: "{{ docker_image_url }}prometheus-openstack-network-exporter"
+prometheus_openstack_network_exporter_tag: "{{ kolla_prometheus_openstack_network_exporter_version|default(prometheus_tag) }}"
+prometheus_valkey_exporter_image: "{{ docker_image_url }}prometheus-valkey-exporter"
+prometheus_valkey_exporter_tag: "{{ kolla_prometheus_valkey_exporter_version|default(prometheus_tag) }}"
 
 ##############################
 # role: designate
@@ -549,6 +553,8 @@ ironic_pxe_image: "{{ docker_image_url }}ironic-pxe"
 ironic_pxe_tag: "{{ ironic_tag }}"
 ironic_pxe_filter_image: "{{ docker_image_url }}ironic-pxe-filter"
 ironic_pxe_filter_tag: "{{ ironic_tag }}"
+ironic_http_image: "{{ docker_image_url }}httpd"
+ironic_http_tag: "{{ kolla_httpd_version|default(kolla_image_version) }}"
 ironic_inspector_image: "{{ docker_image_url }}ironic-inspector"
 ironic_inspector_tag: "{{ kolla_ironic_inspector_version|default(kolla_image_version) }}"
 ironic_dnsmasq_image: "{{ docker_image_url }}dnsmasq"
@@ -606,7 +612,7 @@ skyline_console_image: "{{ docker_image_url }}skyline-console"
 letsencrypt_tag: "{{ kolla_letsencrypt_version|default(kolla_image_version) }}"
 letsencrypt_lego_tag: "{{ kolla_letsencrypt_lego_version|default(letsencrypt_tag) }}"
 letsencrypt_lego_image: "{{ docker_image_url }}letsencrypt-lego"
-letsencrypt_webserver_tag: "{{ kolla_letsencrypt_webserver_version|default(letsencrypt_tag) }}"
+letsencrypt_webserver_tag: "{{ kolla_letsencrypt_webserver_version|default(letsencrypt_tag) if openstack_version in ['2024.1', '2024.2', '2025.1', '2025.2'] else kolla_httpd_version|default(letsencrypt_tag) }}"
 letsencrypt_webserver_image: "{{ docker_image_url }}{{ 'letsencrypt-webserver' if openstack_version in ['2024.1', '2024.2', '2025.1', '2025.2'] else 'httpd' }}"
 
 ##############################