Switch from heat to openstack-client image

Depends-On: I4e4dee8b172623f5be31a4b3aa5fc8a58d25999e Depends-On: I4f0d3922672db8e441e319dd292216d5fc170479 Change-Id: I6bd8a7b246288eb4b4c23580b9ab468e7ca6770a Signed-off-by: Sergiy Markin <smarkin@mirantis.com> Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
2025-12-03 18:10:37 +00:00
parent 725fb3882a
commit 9b270fe356
166 changed files with 688 additions and 688 deletions
--- a/aodh/values.yaml
+++ b/aodh/values.yaml
@@ -43,14 +43,14 @@ labels:

 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    aodh_db_sync: docker.io/kolla/ubuntu-source-aodh-api:ocata
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    aodh_api: docker.io/kolla/ubuntu-source-aodh-api:ocata
    aodh_evaluator: docker.io/kolla/ubuntu-source-aodh-evaluator:ocata
    aodh_listener: docker.io/kolla/ubuntu-source-aodh-listener:ocata
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -35,15 +35,15 @@ helm3_hook: true

 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    scripted_test: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    barbican_db_sync: quay.io/airshipit/barbican:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    barbican_api: quay.io/airshipit/barbican:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    image_repo_sync: docker.io/docker:17.07.0
--- a/blazar/values.yaml
+++ b/blazar/values.yaml
@@ -30,12 +30,12 @@ labels:
 images:
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    rabbit_init: docker.io/rabbitmq:3.13-management
    blazar_db_sync: quay.io/airshipit/blazar:2025.1-ubuntu_jammy
    blazar_api: quay.io/airshipit/blazar:2025.1-ubuntu_jammy
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -41,7 +41,7 @@ labels:
 images:
  tags:
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    ceilometer_central: docker.io/kolla/ubuntu-source-ceilometer-central:wallaby
    ceilometer_compute: docker.io/kolla/ubuntu-source-ceilometer-compute:wallaby
    ceilometer_ipmi: docker.io/kolla/ubuntu-source-ceilometer-base:wallaby
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -32,9 +32,9 @@ images:
    image_repo_sync: 'quay.io/airshipit/docker:27.5.0'
    rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
    rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
-    ks_endpoints: 'quay.io/airshipit/heat:2025.1-ubuntu_noble'
-    ks_service: 'quay.io/airshipit/heat:2025.1-ubuntu_noble'
-    ks_user: 'quay.io/airshipit/heat:2025.1-ubuntu_noble'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
  local_registry:
    active: false
    exclude:
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -43,15 +43,15 @@ release_group: null
 images:
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    cinder_db_sync: quay.io/airshipit/cinder:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    cinder_api: quay.io/airshipit/cinder:2025.1-ubuntu_noble
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    cinder_scheduler: quay.io/airshipit/cinder:2025.1-ubuntu_noble
    cinder_volume: quay.io/airshipit/cinder:2025.1-ubuntu_noble
    cinder_volume_usage_audit: quay.io/airshipit/cinder:2025.1-ubuntu_noble
--- a/cloudkitty/values.yaml
+++ b/cloudkitty/values.yaml
@@ -13,17 +13,17 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble
    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble
    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble
    cloudkitty_storage_init: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    image_repo_sync: docker.io/docker:17.07.0
  pull_policy: "IfNotPresent"
--- a/cyborg/values.yaml
+++ b/cyborg/values.yaml
@@ -13,12 +13,12 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    cyborg_db_sync: quay.io/airshipit/cyborg:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    cyborg_api: quay.io/airshipit/cyborg:2025.1-ubuntu_noble
    cyborg_conductor: quay.io/airshipit/cyborg:2025.1-ubuntu_noble
    cyborg_agent: quay.io/airshipit/cyborg:2025.1-ubuntu_noble
--- a/designate/values.yaml
+++ b/designate/values.yaml
@@ -46,13 +46,13 @@ labels:

 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    designate_db_sync: quay.io/airshipit/designate:2025.1-ubuntu_noble
    designate_api: quay.io/airshipit/designate:2025.1-ubuntu_noble
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -18,13 +18,13 @@
 images:
  tags:
    apache_proxy: docker.io/library/httpd:2.4
-    memory_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    memory_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:8.18.1
    curator: docker.io/untergeek/curator:8.0.10
    ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805
    s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805
    s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    prometheus_elasticsearch_exporter: quay.io/prometheuscommunity/elasticsearch-exporter:v1.9.0
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805
--- a/fluentd/values.yaml
+++ b/fluentd/values.yaml
@@ -26,7 +26,7 @@ images:
  tags:
    fluentd: docker.io/openstackhelm/fluentd:latest-debian
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: IfNotPresent
  local_registry:
--- a/freezer/values.yaml
+++ b/freezer/values.yaml
@@ -25,12 +25,12 @@ images:
  pull_policy: IfNotPresent
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    freezer_db_sync: quay.io/airshipit/freezer-api:2025.1-ubuntu_jammy
    freezer_api: quay.io/airshipit/freezer-api:2025.1-ubuntu_jammy
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -37,16 +37,16 @@ images:
    test: docker.io/xrally/xrally-openstack:2.0.0
    glance_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
    glance_metadefs_load: quay.io/airshipit/glance:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    glance_db_sync: quay.io/airshipit/glance:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    glance_api: quay.io/airshipit/glance:2025.1-ubuntu_noble
    # Bootstrap image requires curl
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: docker.io/docker:17.07.0
  pull_policy: "IfNotPresent"
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -20,8 +20,8 @@ images:
    grafana: docker.io/grafana/grafana:9.2.10
    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    grafana_db_session_sync: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
    grafana_image_renderer: docker.io/grafana/grafana-image-renderer:3.10.5
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -38,14 +38,14 @@ labels:
 images:
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    heat_db_sync: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    heat_api: quay.io/airshipit/heat:2025.1-ubuntu_noble
    heat_cfn: quay.io/airshipit/heat:2025.1-ubuntu_noble
    heat_engine: quay.io/airshipit/heat:2025.1-ubuntu_noble
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -18,9 +18,9 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    horizon_db_sync: quay.io/airshipit/horizon:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    horizon: quay.io/airshipit/horizon:2025.1-ubuntu_noble
    test: docker.io/openstackhelm/osh-selenium:latest-ubuntu_jammy
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -33,17 +33,17 @@ labels:

 images:
  tags:
-    ironic_manage_cleaning_network: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ironic_retrive_cleaning_network: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ironic_retrive_swift_config: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ironic_manage_cleaning_network: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ironic_retrive_cleaning_network: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ironic_retrive_swift_config: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    # Bootstrap image requires curl
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    ironic_db_sync: quay.io/airshipit/ironic:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    ironic_api: quay.io/airshipit/ironic:2025.1-ubuntu_noble
    ironic_conductor: quay.io/airshipit/ironic:2025.1-ubuntu_noble
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -35,18 +35,18 @@ helm3_hook: true

 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    test: docker.io/xrally/xrally-openstack:2.0.0
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    keystone_db_sync: quay.io/airshipit/keystone:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    keystone_fernet_setup: quay.io/airshipit/keystone:2025.1-ubuntu_noble
    keystone_fernet_rotate: quay.io/airshipit/keystone:2025.1-ubuntu_noble
    keystone_credential_setup: quay.io/airshipit/keystone:2025.1-ubuntu_noble
    keystone_credential_rotate: quay.io/airshipit/keystone:2025.1-ubuntu_noble
-    keystone_credential_cleanup: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    keystone_credential_cleanup: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    keystone_api: quay.io/airshipit/keystone:2025.1-ubuntu_noble
    keystone_domain_manage: quay.io/airshipit/keystone:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -25,8 +25,8 @@ images:
    kibana: docker.elastic.co/kibana/kibana:8.18.1
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
-    register_kibana_indexes: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    flush_kibana_metadata: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
  pull_policy: IfNotPresent
  local_registry:
    active: false
--- a/kubernetes-keystone-webhook/values.yaml
+++ b/kubernetes-keystone-webhook/values.yaml
@@ -22,7 +22,7 @@ labels:
 images:
  tags:
    kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:v1.19.0
-    scripted_test: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: IfNotPresent
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -31,14 +31,14 @@ labels:

 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    magnum_db_sync: docker.io/openstackhelm/magnum:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    magnum_api: docker.io/openstackhelm/magnum:2025.1-ubuntu_noble
    magnum_conductor: docker.io/openstackhelm/magnum:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
--- a/manila/values.yaml
+++ b/manila/values.yaml
@@ -44,14 +44,14 @@ helm3_hook: true

 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    manila_db_sync: quay.io/airshipit/manila:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    manila_api: quay.io/airshipit/manila:2025.1-ubuntu_noble
    manila_data: quay.io/airshipit/manila:2025.1-ubuntu_noble
    manila_scheduler: quay.io/airshipit/manila:2025.1-ubuntu_noble
--- a/mariadb-backup/values.yaml
+++ b/mariadb-backup/values.yaml
@@ -21,7 +21,7 @@ release_group: null
 images:
  tags:
    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
  pull_policy: "IfNotPresent"
--- a/mariadb-cluster/values.yaml
+++ b/mariadb-cluster/values.yaml
@@ -24,7 +24,7 @@ images:
    initContainer: ghcr.io/mariadb-operator/init:v0.0.6
    mariadb: docker.io/library/mariadb:10.6.14-focal
    prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
    scripted_test: docker.io/library/mariadb:10.6.14-focal
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -23,11 +23,11 @@ images:
    mariadb: quay.io/airshipit/mariadb:latest-ubuntu_noble
    prometheus_create_mysql_user: quay.io/airshipit/mariadb:11.4.8-noble
    prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
    mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_jammy
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    scripted_test: quay.io/airshipit/mariadb:latest-ubuntu_noble
    mariadb_controller: quay.io/airshipit/mariadb:latest-ubuntu_noble
  pull_policy: "IfNotPresent"
--- a/masakari/values.yaml
+++ b/masakari/values.yaml
@@ -13,12 +13,12 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    db_sync: docker.io/openstackhelm/masakari:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    masakari_api: docker.io/openstackhelm/masakari:2025.1-ubuntu_noble
    masakari_engine: docker.io/openstackhelm/masakari:2025.1-ubuntu_noble
    masakari_host_monitor: docker.io/openstackhelm/masakari-monitors:2025.1-ubuntu_noble
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -41,15 +41,15 @@ release_group: null
 images:
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    mistral_db_sync: docker.io/kolla/ubuntu-source-mistral-api:wallaby
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    mistral_api: docker.io/kolla/ubuntu-source-mistral-api:wallaby
    mistral_engine: docker.io/kolla/ubuntu-source-mistral-engine:wallaby
    mistral_event_engine: docker.io/kolla/ubuntu-source-mistral-engine:wallaby
--- a/monasca/values.yaml
+++ b/monasca/values.yaml
@@ -18,13 +18,13 @@
 ---
 images:
  tags:
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    influxdb_init: radial/busyboxplus:curl
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    monasca_db_sync: docker.io/openstackhelm/monasca:stein-ubuntu_bionic
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    monasca_api: docker.io/openstackhelm/monasca_api:stein-ubuntu_bionic
    monasca_collector: docker.io/openstackhelm/monasca_agent:stein-ubuntu_bionic
    monasca_forwarder: docker.io/openstackhelm/monasca_forwarder:stein-ubuntu_bionic
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -20,16 +20,16 @@ release_group: null

 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    test: docker.io/xrally/xrally-openstack:2.0.0
    purge_test: docker.io/openstackhelm/ospurge:latest
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    neutron_db_sync: quay.io/airshipit/neutron:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    netoffload: ghcr.io/vexxhost/netoffload:v1.0.1
    neutron_server: quay.io/airshipit/neutron:2025.1-ubuntu_noble
    neutron_rpc_server: quay.io/airshipit/neutron:2025.1-ubuntu_noble
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -57,18 +57,18 @@ labels:
 images:
  pull_policy: IfNotPresent
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    nova_archive_deleted_rows: quay.io/airshipit/nova:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    nova_api: quay.io/airshipit/nova:2025.1-ubuntu_noble
    nova_cell_setup: quay.io/airshipit/nova:2025.1-ubuntu_noble
-    nova_cell_setup_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    nova_cell_setup_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    nova_compute: quay.io/airshipit/nova:2025.1-ubuntu_noble
    nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:wallaby'
    nova_compute_ssh: quay.io/airshipit/nova:2025.1-ubuntu_noble
--- a/octavia/values.yaml
+++ b/octavia/values.yaml
@@ -47,14 +47,14 @@ helm3_hook: true
 images:
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    octavia_db_sync: quay.io/airshipit/octavia:2025.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: docker.io/docker:17.07.0
    octavia_api: quay.io/airshipit/octavia:2025.1-ubuntu_jammy
--- a/placement/values.yaml
+++ b/placement/values.yaml
@@ -31,11 +31,11 @@ images:
  pull_policy: IfNotPresent
  tags:
    placement: quay.io/airshipit/placement:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    placement_db_sync: quay.io/airshipit/placement:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: docker.io/docker:17.07.0
--- a/postgresql/values.yaml
+++ b/postgresql/values.yaml
@@ -158,7 +158,7 @@ images:
    postgresql: "docker.io/library/postgres:14.5"
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    prometheus_postgresql_exporter: docker.io/wrouesnel/postgres_exporter:v0.4.6
    prometheus_postgresql_exporter_create_user: "docker.io/library/postgres:14.5"
    postgresql_backup: "quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_jammy"
--- a/powerdns/values.yaml
+++ b/powerdns/values.yaml
@@ -19,7 +19,7 @@
 images:
  tags:
    powerdns: docker.io/psitrax/powerdns:4.1.10
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    db_sync: docker.io/psitrax/powerdns:4.1.10
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
--- a/prometheus-mysql-exporter/values.yaml
+++ b/prometheus-mysql-exporter/values.yaml
@@ -22,7 +22,7 @@ images:
  tags:
    prometheus_create_mysql_user: docker.io/library/mariadb:10.5.9-focal
    prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: "IfNotPresent"
--- a/prometheus-openstack-exporter/values.yaml
+++ b/prometheus-openstack-exporter/values.yaml
@@ -20,7 +20,7 @@ images:
    prometheus_openstack_exporter: docker.io/openstackhelm/prometheus-openstack-exporter:latest-ubuntu_jammy
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
  pull_policy: IfNotPresent
  local_registry:
    active: false
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -20,7 +20,7 @@ images:
  tags:
    apache_proxy: docker.io/library/httpd:2.4
    prometheus: docker.io/prom/prometheus:v2.25.0
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: IfNotPresent
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -33,8 +33,8 @@ labels:
 images:
  tags:
    prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v1.0.0-RC7.1
-    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    rabbitmq_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    rabbitmq_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbitmq: quay.io/airshipit/rabbitmq:3.10.18
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    scripted_test: quay.io/airshipit/rabbitmq:3.10.18-management
--- a/rally/values.yaml
+++ b/rally/values.yaml
@@ -30,9 +30,9 @@ images:
    db_init: docker.io/xrally/xrally-openstack:2.0.0
    rally_db_sync: docker.io/xrally/xrally-openstack:2.0.0
    run_task: docker.io/xrally/xrally-openstack:2.0.0
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    image_repo_sync: docker.io/docker:17.07.0
  pull_policy: "IfNotPresent"
  local_registry:
--- a/shaker/values.yaml
+++ b/shaker/values.yaml
@@ -28,7 +28,7 @@ images:
  tags:
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    shaker_run_tests: docker.io/performa/shaker:latest
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: "IfNotPresent"
  local_registry:
--- a/skyline/values.yaml
+++ b/skyline/values.yaml
@@ -29,9 +29,9 @@ images:
    skyline_db_sync: quay.io/airshipit/skyline:2025.2-ubuntu_noble
    skyline: quay.io/airshipit/skyline:2025.2-ubuntu_noble
    skyline_nginx: quay.io/airshipit/skyline:2025.2-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
    dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
  local_registry:
    active: false
    exclude:
--- a/tacker/values.yaml
+++ b/tacker/values.yaml
@@ -39,12 +39,12 @@ images:
    tacker_server: quay.io/airshipit/tacker:2025.1-ubuntu_noble
    tacker_conductor: quay.io/airshipit/tacker:2025.1-ubuntu_noble
    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    tacker_db_sync: quay.io/airshipit/tacker:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
  local_registry:
--- a/tempest/values.yaml
+++ b/tempest/values.yaml
@@ -25,7 +25,7 @@ images:
  tags:
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    tempest_run_tests: docker.io/openstackhelm/tempest:latest-ubuntu_focal
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    image_repo_sync: docker.io/docker:17.07.0
  pull_policy: "IfNotPresent"
  local_registry:
--- a/values_overrides/barbican/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/barbican/2024.1-ubuntu_jammy.yaml
@@ -1,13 +1,13 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    scripted_test: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    scripted_test: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    barbican_db_sync: "quay.io/airshipit/barbican:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    barbican_api: "quay.io/airshipit/barbican:2024.1-ubuntu_jammy"
 ...
--- a/values_overrides/barbican/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/barbican/2024.2-ubuntu_jammy.yaml
@@ -1,13 +1,13 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    scripted_test: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    scripted_test: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    barbican_db_sync: "quay.io/airshipit/barbican:2024.2-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    barbican_api: "quay.io/airshipit/barbican:2024.2-ubuntu_jammy"
 ...
--- a/values_overrides/barbican/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/barbican/2025.1-ubuntu_jammy.yaml
@@ -1,13 +1,13 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    scripted_test: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    scripted_test: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    barbican_db_sync: "quay.io/airshipit/barbican:2025.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    barbican_api: "quay.io/airshipit/barbican:2025.1-ubuntu_jammy"
 ...
--- a/values_overrides/barbican/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/barbican/2025.1-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    scripted_test: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    scripted_test: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    barbican_db_sync: "quay.io/airshipit/barbican:2025.1-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    barbican_api: "quay.io/airshipit/barbican:2025.1-ubuntu_noble"
 ...
--- a/values_overrides/barbican/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/barbican/2025.2-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    scripted_test: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    scripted_test: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    barbican_db_sync: "quay.io/airshipit/barbican:2025.2-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    barbican_api: "quay.io/airshipit/barbican:2025.2-ubuntu_noble"
 ...
--- a/values_overrides/blazar/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/blazar/2025.1-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    blazar_api: quay.io/airshipit/blazar:2025.1-ubuntu_jammy
    blazar_manager: quay.io/airshipit/blazar:2025.1-ubuntu_jammy
    blazar_db_sync: quay.io/airshipit/blazar:2025.1-ubuntu_jammy
--- a/values_overrides/blazar/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/blazar/2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    blazar_api: quay.io/airshipit/blazar:2025.1-ubuntu_noble
    blazar_manager: quay.io/airshipit/blazar:2025.1-ubuntu_noble
    blazar_db_sync: quay.io/airshipit/blazar:2025.1-ubuntu_noble
--- a/values_overrides/blazar/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/blazar/2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
    blazar_api: quay.io/airshipit/blazar:2025.2-ubuntu_noble
    blazar_manager: quay.io/airshipit/blazar:2025.2-ubuntu_noble
    blazar_db_sync: quay.io/airshipit/blazar:2025.2-ubuntu_noble
--- a/values_overrides/ceph-rgw/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/ceph-rgw/2025.1-ubuntu_jammy.yaml
@@ -13,7 +13,7 @@
 ---
 images:
  tags:
-    ks_endpoints: 'quay.io/airshipit/heat:2025.1-ubuntu_jammy'
-    ks_service: 'quay.io/airshipit/heat:2025.1-ubuntu_jammy'
-    ks_user: 'quay.io/airshipit/heat:2025.1-ubuntu_jammy'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy'
 ...
--- a/values_overrides/ceph-rgw/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/ceph-rgw/2025.1-ubuntu_noble.yaml
@@ -13,7 +13,7 @@
 ---
 images:
  tags:
-    ks_endpoints: 'quay.io/airshipit/heat:2025.1-ubuntu_noble'
-    ks_service: 'quay.io/airshipit/heat:2025.1-ubuntu_noble'
-    ks_user: 'quay.io/airshipit/heat:2025.1-ubuntu_noble'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
 ...
--- a/values_overrides/ceph-rgw/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/ceph-rgw/2025.2-ubuntu_noble.yaml
@@ -13,7 +13,7 @@
 ---
 images:
  tags:
-    ks_endpoints: 'quay.io/airshipit/heat:2025.2-ubuntu_noble'
-    ks_service: 'quay.io/airshipit/heat:2025.2-ubuntu_noble'
-    ks_user: 'quay.io/airshipit/heat:2025.2-ubuntu_noble'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble'
 ...
--- a/values_overrides/cinder/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/cinder/2024.1-ubuntu_jammy.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    db_init: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    cinder_db_sync: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    cinder_api: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    bootstrap: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    cinder_scheduler: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
    cinder_volume: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
--- a/values_overrides/cinder/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/cinder/2024.2-ubuntu_jammy.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    db_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    cinder_db_sync: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    cinder_api: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
-    bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    cinder_scheduler: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
    cinder_volume: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
--- a/values_overrides/cinder/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/cinder/2025.1-ubuntu_jammy.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    cinder_db_sync: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    cinder_api: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    cinder_scheduler: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
    cinder_volume: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
--- a/values_overrides/cinder/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cinder/2025.1-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    cinder_db_sync: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    cinder_api: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    cinder_scheduler: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
    cinder_volume: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
--- a/values_overrides/cinder/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cinder/2025.2-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    cinder_db_sync: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    cinder_api: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    cinder_scheduler: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
    cinder_volume: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
--- a/values_overrides/cloudkitty/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/cloudkitty/2024.2-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2024.2-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2024.2-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2024.2-ubuntu_jammy
-    ks_user: quay.io/airshipit/heat:2024.2-ubuntu_jammy
-    ks_service: quay.io/airshipit/heat:2024.2-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    bootstrap: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
+    ks_user: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
+    ks_service: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
+    ks_endpoints: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
    cloudkitty_api: quay.io/airshipit/cloudkitty:2024.2-ubuntu_jammy
    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2024.2-ubuntu_jammy
    cloudkitty_processor: quay.io/airshipit/cloudkitty:2024.2-ubuntu_jammy
--- a/values_overrides/cloudkitty/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/cloudkitty/2025.1-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.1-ubuntu_jammy
    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.1-ubuntu_jammy
    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.1-ubuntu_jammy
--- a/values_overrides/cloudkitty/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cloudkitty/2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble
    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble
    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble
--- a/values_overrides/cloudkitty/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cloudkitty/2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble
    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble
    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble
--- a/values_overrides/elasticsearch/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/elasticsearch/2025.1-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    memory_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    memory_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
 ...
--- a/values_overrides/elasticsearch/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/elasticsearch/2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    memory_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    memory_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
 ...
--- a/values_overrides/elasticsearch/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/elasticsearch/2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    memory_init: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    memory_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
 ...
--- a/values_overrides/fluentd/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/fluentd/2025.1-ubuntu_jammy.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
 ...
--- a/values_overrides/fluentd/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/fluentd/2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
 ...
--- a/values_overrides/fluentd/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/fluentd/2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
 ...
--- a/values_overrides/freezer/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/freezer/2025.1-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    freezer_db_sync: quay.io/airshipit/freezer-api:2025.1-ubuntu_jammy
    freezer_api: quay.io/airshipit/freezer-api:2025.1-ubuntu_jammy
 ...
--- a/values_overrides/freezer/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/freezer/2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    freezer_db_sync: quay.io/airshipit/freezer-api:2025.1-ubuntu_noble
    freezer_api: quay.io/airshipit/freezer-api:2025.1-ubuntu_noble
 ...
--- a/values_overrides/freezer/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/freezer/2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
    freezer_db_sync: quay.io/airshipit/freezer-api:2025.2-ubuntu_noble
    freezer_api: quay.io/airshipit/freezer-api:2025.2-ubuntu_noble
 ...
--- a/values_overrides/glance/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/glance/2024.1-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    glance_db_sync: "quay.io/airshipit/glance:2024.1-ubuntu_jammy"
    glance_api: "quay.io/airshipit/glance:2024.1-ubuntu_jammy"
    glance_metadefs_load: "quay.io/airshipit/glance:2024.1-ubuntu_jammy"
--- a/values_overrides/glance/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/glance/2024.2-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    glance_db_sync: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
    glance_api: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
    glance_metadefs_load: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
--- a/values_overrides/glance/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/glance/2025.1-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
    glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
--- a/values_overrides/glance/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/glance/2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_noble"
    glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_noble"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_noble"
--- a/values_overrides/glance/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/glance/2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    glance_db_sync: "quay.io/airshipit/glance:2025.2-ubuntu_noble"
    glance_api: "quay.io/airshipit/glance:2025.2-ubuntu_noble"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.2-ubuntu_noble"
--- a/values_overrides/grafana/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/grafana/2025.1-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    grafana_db_session_sync: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
 ...
--- a/values_overrides/grafana/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/grafana/2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    grafana_db_session_sync: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
 ...
--- a/values_overrides/grafana/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/grafana/2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    grafana_db_session_sync: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
 ...
--- a/values_overrides/heat/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/heat/2024.1-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    heat_db_sync: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
    heat_api: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
    heat_cfn: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
--- a/values_overrides/heat/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/heat/2024.2-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    heat_db_sync: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
    heat_api: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
    heat_cfn: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
--- a/values_overrides/heat/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/heat/2025.1-ubuntu_jammy.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
    heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
    heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
--- a/values_overrides/heat/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/heat/2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
    heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
    heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
--- a/values_overrides/heat/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/heat/2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    heat_db_sync: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
    heat_api: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
    heat_cfn: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
--- a/values_overrides/horizon/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/horizon/2024.1-ubuntu_jammy.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2024.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2024.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
    horizon_db_sync: quay.io/airshipit/horizon:2024.1-ubuntu_jammy
    horizon: quay.io/airshipit/horizon:2024.1-ubuntu_jammy
 ...
--- a/values_overrides/horizon/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/horizon/2024.2-ubuntu_jammy.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2024.2-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
    horizon_db_sync: quay.io/airshipit/horizon:2024.2-ubuntu_jammy
    horizon: quay.io/airshipit/horizon:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/horizon/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/horizon/2025.1-ubuntu_jammy.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
    horizon_db_sync: quay.io/airshipit/horizon:2025.1-ubuntu_jammy
    horizon: quay.io/airshipit/horizon:2025.1-ubuntu_jammy
 ...
--- a/values_overrides/horizon/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/horizon/2025.1-ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    horizon_db_sync: quay.io/airshipit/horizon:2025.1-ubuntu_noble
    horizon: quay.io/airshipit/horizon:2025.1-ubuntu_noble
 ...
--- a/values_overrides/horizon/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/horizon/2025.2-ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
    horizon_db_sync: quay.io/airshipit/horizon:2025.2-ubuntu_noble
    horizon: quay.io/airshipit/horizon:2025.2-ubuntu_noble
 ...
--- a/values_overrides/keystone/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/keystone/2024.1-ubuntu_jammy.yaml
@@ -1,16 +1,16 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    keystone_api: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    keystone_bootstrap: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
    keystone_credential_rotate: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
    keystone_credential_setup: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
    keystone_db_sync: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
    keystone_domain_manage: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
    keystone_fernet_rotate: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
    keystone_fernet_setup: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
 ...
--- a/values_overrides/keystone/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/keystone/2024.2-ubuntu_jammy.yaml
@@ -1,16 +1,16 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    keystone_api: "quay.io/airshipit/keystone:2024.2-ubuntu_jammy"
-    keystone_bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
    keystone_credential_rotate: "quay.io/airshipit/keystone:2024.2-ubuntu_jammy"
    keystone_credential_setup: "quay.io/airshipit/keystone:2024.2-ubuntu_jammy"
    keystone_db_sync: "quay.io/airshipit/keystone:2024.2-ubuntu_jammy"
    keystone_domain_manage: "quay.io/airshipit/keystone:2024.2-ubuntu_jammy"
    keystone_fernet_rotate: "quay.io/airshipit/keystone:2024.2-ubuntu_jammy"
    keystone_fernet_setup: "quay.io/airshipit/keystone:2024.2-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy"
 ...
--- a/values_overrides/keystone/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/keystone/2025.1-ubuntu_jammy.yaml
@@ -1,16 +1,16 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    keystone_api: "quay.io/airshipit/keystone:2025.1-ubuntu_jammy"
-    keystone_bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
    keystone_credential_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_jammy"
    keystone_credential_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_jammy"
    keystone_db_sync: "quay.io/airshipit/keystone:2025.1-ubuntu_jammy"
    keystone_domain_manage: "quay.io/airshipit/keystone:2025.1-ubuntu_jammy"
    keystone_fernet_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_jammy"
    keystone_fernet_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy"
 ...
--- a/values_overrides/keystone/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/keystone/2025.1-ubuntu_noble.yaml
@@ -1,16 +1,16 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    keystone_api: "quay.io/airshipit/keystone:2025.1-ubuntu_noble"
-    keystone_bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
    keystone_credential_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_noble"
    keystone_credential_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_noble"
    keystone_db_sync: "quay.io/airshipit/keystone:2025.1-ubuntu_noble"
    keystone_domain_manage: "quay.io/airshipit/keystone:2025.1-ubuntu_noble"
    keystone_fernet_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_noble"
    keystone_fernet_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble"
 ...
--- a/values_overrides/keystone/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/keystone/2025.2-ubuntu_noble.yaml
@@ -1,16 +1,16 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    keystone_api: "quay.io/airshipit/keystone:2025.2-ubuntu_noble"
-    keystone_bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
    keystone_credential_rotate: "quay.io/airshipit/keystone:2025.2-ubuntu_noble"
    keystone_credential_setup: "quay.io/airshipit/keystone:2025.2-ubuntu_noble"
    keystone_db_sync: "quay.io/airshipit/keystone:2025.2-ubuntu_noble"
    keystone_domain_manage: "quay.io/airshipit/keystone:2025.2-ubuntu_noble"
    keystone_fernet_rotate: "quay.io/airshipit/keystone:2025.2-ubuntu_noble"
    keystone_fernet_setup: "quay.io/airshipit/keystone:2025.2-ubuntu_noble"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble"
 ...
--- a/values_overrides/kibana/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/kibana/2025.1-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    register_kibana_indexes: quay.io/airshipit/heat:2025.1-ubuntu_jammy
-    flush_kibana_metadata: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
 ...
--- a/values_overrides/kibana/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/kibana/2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    register_kibana_indexes: quay.io/airshipit/heat:2025.1-ubuntu_noble
-    flush_kibana_metadata: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
 ...
--- a/values_overrides/kibana/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/kibana/2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    register_kibana_indexes: quay.io/airshipit/heat:2025.2-ubuntu_noble
-    flush_kibana_metadata: quay.io/airshipit/heat:2025.2-ubuntu_noble
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
 ...
--- a/values_overrides/kubernetes-keystone-webhook/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/2025.1-ubuntu_jammy.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    scripted_test: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
 ...
--- a/values_overrides/kubernetes-keystone-webhook/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    scripted_test: quay.io/airshipit/heat:2025.1-ubuntu_noble
+    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
 ...
--- a/Show More
+++ b/Show More