Switch to openstack-client images in UV overrides

Recently we switched from heat to openstack-client images in all jobs which communicate with Openstack API. See this I6bd8a7b246288eb4b4c23580b9ab468e7ca6770a But UV overrides were not properly rebased. Change-Id: I41ab9ba4026d5f1b52d1b7c8d5209978d3087ba5 Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
2026-01-16 11:08:59 -06:00
parent aed8f58261
commit 8b8293bb34
61 changed files with 232 additions and 232 deletions
--- a/values_overrides/barbican/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/barbican/uv-2025.1-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    scripted_test: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    scripted_test: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    barbican_db_sync: "quay.io/airshipit/barbican:2025.1-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    barbican_api: "quay.io/airshipit/barbican:2025.1-ubuntu_noble_uv"
 ...
--- a/values_overrides/barbican/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/barbican/uv-2025.2-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    scripted_test: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    scripted_test: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    barbican_db_sync: "quay.io/airshipit/barbican:2025.2-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    barbican_api: "quay.io/airshipit/barbican:2025.2-ubuntu_noble_uv"
 ...
--- a/values_overrides/blazar/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/blazar/uv-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    blazar_api: quay.io/airshipit/blazar:2025.1-ubuntu_noble_uv
    blazar_manager: quay.io/airshipit/blazar:2025.1-ubuntu_noble_uv
    blazar_db_sync: quay.io/airshipit/blazar:2025.1-ubuntu_noble_uv
--- a/values_overrides/blazar/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/blazar/uv-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    blazar_api: quay.io/airshipit/blazar:2025.2-ubuntu_noble_uv
    blazar_manager: quay.io/airshipit/blazar:2025.2-ubuntu_noble_uv
    blazar_db_sync: quay.io/airshipit/blazar:2025.2-ubuntu_noble_uv
--- a/values_overrides/ceph-rgw/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/ceph-rgw/uv-2025.1-ubuntu_noble.yaml
@@ -13,7 +13,7 @@
 ---
 images:
  tags:
-    ks_endpoints: 'quay.io/airshipit/heat:2025.1-ubuntu_noble_uv'
-    ks_service: 'quay.io/airshipit/heat:2025.1-ubuntu_noble_uv'
-    ks_user: 'quay.io/airshipit/heat:2025.1-ubuntu_noble_uv'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv'
 ...
--- a/values_overrides/ceph-rgw/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/ceph-rgw/uv-2025.2-ubuntu_noble.yaml
@@ -13,7 +13,7 @@
 ---
 images:
  tags:
-    ks_endpoints: 'quay.io/airshipit/heat:2025.2-ubuntu_noble_uv'
-    ks_service: 'quay.io/airshipit/heat:2025.2-ubuntu_noble_uv'
-    ks_user: 'quay.io/airshipit/heat:2025.2-ubuntu_noble_uv'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv'
 ...
--- a/values_overrides/cinder/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cinder/uv-2025.1-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    cinder_db_sync: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    cinder_api: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_uv"
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    cinder_scheduler: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_uv"
    cinder_volume: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_uv"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_uv"
--- a/values_overrides/cinder/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cinder/uv-2025.2-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    cinder_db_sync: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    cinder_api: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_uv"
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    cinder_scheduler: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_uv"
    cinder_volume: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_uv"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_uv"
--- a/values_overrides/cloudkitty/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cloudkitty/uv-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_uv
    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_uv
    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_uv
--- a/values_overrides/cloudkitty/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cloudkitty/uv-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_uv
    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_uv
    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_uv
--- a/values_overrides/elasticsearch/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/elasticsearch/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    memory_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    memory_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/elasticsearch/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/elasticsearch/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    memory_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    memory_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/fluentd/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/fluentd/uv-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/fluentd/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/fluentd/uv-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/freezer/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/freezer/uv-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    freezer_db_sync: quay.io/airshipit/freezer-api:2025.1-ubuntu_noble_uv
    freezer_api: quay.io/airshipit/freezer-api:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/freezer/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/freezer/uv-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    freezer_db_sync: quay.io/airshipit/freezer-api:2025.2-ubuntu_noble_uv
    freezer_api: quay.io/airshipit/freezer-api:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/glance/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/glance/uv-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_noble_uv"
    glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_noble_uv"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_noble_uv"
--- a/values_overrides/glance/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/glance/uv-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    glance_db_sync: "quay.io/airshipit/glance:2025.2-ubuntu_noble_uv"
    glance_api: "quay.io/airshipit/glance:2025.2-ubuntu_noble_uv"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.2-ubuntu_noble_uv"
--- a/values_overrides/grafana/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/grafana/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    grafana_db_session_sync: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/grafana/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/grafana/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    grafana_db_session_sync: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/horizon/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/horizon/uv-2025.1-ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    horizon_db_sync: quay.io/airshipit/horizon:2025.1-ubuntu_noble_uv
    horizon: quay.io/airshipit/horizon:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/horizon/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/horizon/uv-2025.2-ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    horizon_db_sync: quay.io/airshipit/horizon:2025.2-ubuntu_noble_uv
    horizon: quay.io/airshipit/horizon:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/keystone/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/keystone/uv-2025.1-ubuntu_noble.yaml
@@ -1,16 +1,16 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    keystone_api: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_uv"
-    keystone_bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    keystone_credential_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_uv"
    keystone_credential_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_uv"
    keystone_db_sync: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_uv"
    keystone_domain_manage: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_uv"
    keystone_fernet_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_uv"
    keystone_fernet_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
 ...
--- a/values_overrides/keystone/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/keystone/uv-2025.2-ubuntu_noble.yaml
@@ -1,16 +1,16 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    keystone_api: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_uv"
-    keystone_bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    keystone_credential_rotate: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_uv"
    keystone_credential_setup: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_uv"
    keystone_db_sync: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_uv"
    keystone_domain_manage: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_uv"
    keystone_fernet_rotate: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_uv"
    keystone_fernet_setup: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
 ...
--- a/values_overrides/kibana/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/kibana/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    register_kibana_indexes: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    flush_kibana_metadata: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/kibana/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/kibana/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    register_kibana_indexes: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    flush_kibana_metadata: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/kubernetes-keystone-webhook/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/uv-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    scripted_test: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/kubernetes-keystone-webhook/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/uv-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    scripted_test: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    scripted_test: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/manila/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/manila/uv-2025.1-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    manila_db_sync: quay.io/airshipit/manila:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    manila_api: quay.io/airshipit/manila:2025.1-ubuntu_noble_uv
    manila_data: quay.io/airshipit/manila:2025.1-ubuntu_noble_uv
    manila_scheduler: quay.io/airshipit/manila:2025.1-ubuntu_noble_uv
--- a/values_overrides/manila/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/manila/uv-2025.2-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    manila_db_sync: quay.io/airshipit/manila:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    manila_api: quay.io/airshipit/manila:2025.2-ubuntu_noble_uv
    manila_data: quay.io/airshipit/manila:2025.2-ubuntu_noble_uv
    manila_scheduler: quay.io/airshipit/manila:2025.2-ubuntu_noble_uv
--- a/values_overrides/mariadb-backup/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-backup/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/mariadb-backup/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-backup/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/mariadb-cluster/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-cluster/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/mariadb-cluster/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-cluster/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/mariadb/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/mariadb/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/mariadb/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/mariadb/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/neutron/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/neutron/uv-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    neutron_db_sync: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
    neutron_dhcp: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
    neutron_l3: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
--- a/values_overrides/neutron/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/neutron/uv-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    neutron_db_sync: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
    neutron_dhcp: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
    neutron_l3: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
--- a/values_overrides/nova/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/nova/uv-2025.1-ubuntu_noble.yaml
@@ -1,15 +1,15 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    nova_api: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
    nova_cell_setup: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
-    nova_cell_setup_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    nova_cell_setup_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    nova_compute: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
    nova_compute_ssh: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
    nova_conductor: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
--- a/values_overrides/nova/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/nova/uv-2025.2-ubuntu_noble.yaml
@@ -1,15 +1,15 @@
 ---
 images:
  tags:
-    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    nova_api: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
    nova_cell_setup: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
-    nova_cell_setup_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    nova_cell_setup_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    nova_compute: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
    nova_compute_ssh: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
    nova_conductor: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
--- a/values_overrides/octavia/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/octavia/uv-2025.1-ubuntu_noble.yaml
@@ -2,14 +2,14 @@
 images:
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    octavia_db_sync: quay.io/airshipit/octavia:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_noble
    image_repo_sync: docker.io/docker:17.07.0
    octavia_api: quay.io/airshipit/octavia:2025.1-ubuntu_noble_uv
--- a/values_overrides/octavia/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/octavia/uv-2025.2-ubuntu_noble.yaml
@@ -2,14 +2,14 @@
 images:
  tags:
    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    octavia_db_sync: quay.io/airshipit/octavia:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_noble
    image_repo_sync: docker.io/docker:17.07.0
    octavia_api: quay.io/airshipit/octavia:2025.2-ubuntu_noble_uv
--- a/values_overrides/placement/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/placement/uv-2025.1-ubuntu_noble.yaml
@@ -3,11 +3,11 @@ images:
  pull_policy: IfNotPresent
  tags:
    placement: "quay.io/airshipit/placement:2025.1-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv"
    placement_db_sync: "quay.io/airshipit/placement:2025.1-ubuntu_noble_uv"
    dep_check: "quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy"
    image_repo_sync: "docker.io/docker:17.07.0"
--- a/values_overrides/placement/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/placement/uv-2025.2-ubuntu_noble.yaml
@@ -3,11 +3,11 @@ images:
  pull_policy: IfNotPresent
  tags:
    placement: "quay.io/airshipit/placement:2025.2-ubuntu_noble_uv"
-    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv"
    placement_db_sync: "quay.io/airshipit/placement:2025.2-ubuntu_noble_uv"
    dep_check: "quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy"
    image_repo_sync: "docker.io/docker:17.07.0"
--- a/values_overrides/postgresql/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/postgresql/uv-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/postgresql/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/postgresql/uv-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/powerdns/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/powerdns/uv-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/powerdns/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/powerdns/uv-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/prometheus-mysql-exporter/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/prometheus-mysql-exporter/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/prometheus-mysql-exporter/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/prometheus-mysql-exporter/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/prometheus/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/prometheus/uv-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/prometheus/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/prometheus/uv-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/rabbitmq/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/rabbitmq/uv-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    rabbitmq_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    rabbitmq_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/rabbitmq/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/rabbitmq/uv-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    rabbitmq_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    rabbitmq_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/skyline/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/skyline/uv-2025.2-ubuntu_noble.yaml
@@ -4,7 +4,7 @@ images:
    skyline_db_sync: quay.io/airshipit/skyline:2025.2-ubuntu_noble_uv
    skyline: quay.io/airshipit/skyline:2025.2-ubuntu_noble_uv
    skyline_nginx: quay.io/airshipit/skyline:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/tacker/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/tacker/uv-2025.1-ubuntu_noble.yaml
@@ -6,10 +6,10 @@ images:
  tags:
    tacker_server: quay.io/airshipit/tacker:2025.1-ubuntu_noble_uv
    tacker_conductor: quay.io/airshipit/tacker:2025.1-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    tacker_db_sync: quay.io/airshipit/tacker:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/tacker/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/tacker/uv-2025.2-ubuntu_noble.yaml
@@ -6,10 +6,10 @@ images:
  tags:
    tacker_server: quay.io/airshipit/tacker:2025.2-ubuntu_noble_uv
    tacker_conductor: quay.io/airshipit/tacker:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    tacker_db_sync: quay.io/airshipit/tacker:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
 ...
--- a/values_overrides/watcher/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/watcher/uv-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    watcher_api: quay.io/airshipit/watcher:2025.1-ubuntu_noble_uv
    watcher_decision_engine: quay.io/airshipit/watcher:2025.1-ubuntu_noble_uv
    watcher_applier: quay.io/airshipit/watcher:2025.1-ubuntu_noble_uv
--- a/values_overrides/watcher/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/watcher/uv-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    watcher_api: quay.io/airshipit/watcher:2025.2-ubuntu_noble_uv
    watcher_decision_engine: quay.io/airshipit/watcher:2025.2-ubuntu_noble_uv
    watcher_applier: quay.io/airshipit/watcher:2025.2-ubuntu_noble_uv
--- a/values_overrides/zaqar/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/zaqar/uv-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
    zaqar_api: quay.io/airshipit/zaqar:2025.1-ubuntu_noble_uv
    zaqar_db_sync: quay.io/airshipit/zaqar:2025.1-ubuntu_noble_uv
 ...
--- a/values_overrides/zaqar/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/zaqar/uv-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
  tags:
-    bootstrap: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_init: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    db_drop: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_user: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_service: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
-    ks_endpoints: quay.io/airshipit/heat:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
    zaqar_api: quay.io/airshipit/zaqar:2025.2-ubuntu_noble_uv
    zaqar_db_sync: quay.io/airshipit/zaqar:2025.2-ubuntu_noble_uv
 ...