diff --git a/values_overrides/barbican/uv-2025.1-ubuntu_noble.yaml b/values_overrides/barbican/loci-2025.1-ubuntu_noble.yaml
similarity index 84%
rename from values_overrides/barbican/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/barbican/loci-2025.1-ubuntu_noble.yaml
index 208e4e69ba..2d34d7e0fd 100644
--- a/values_overrides/barbican/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/barbican/loci-2025.1-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
   tags:
-    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/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"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    scripted_test: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    barbican_db_sync: "quay.io/airshipit/barbican:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    barbican_api: "quay.io/airshipit/barbican:2025.1-ubuntu_noble_loci"
 ...
diff --git a/values_overrides/barbican/uv-2025.2-ubuntu_noble.yaml b/values_overrides/barbican/loci-2025.2-ubuntu_noble.yaml
similarity index 84%
rename from values_overrides/barbican/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/barbican/loci-2025.2-ubuntu_noble.yaml
index 4208ff7444..4091bebce4 100644
--- a/values_overrides/barbican/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/barbican/loci-2025.2-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
   tags:
-    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/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"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    scripted_test: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    barbican_db_sync: "quay.io/airshipit/barbican:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    barbican_api: "quay.io/airshipit/barbican:2025.2-ubuntu_noble_loci"
 ...
diff --git a/values_overrides/blazar/uv-2025.1-ubuntu_noble.yaml b/values_overrides/blazar/loci-2025.1-ubuntu_noble.yaml
similarity index 79%
rename from values_overrides/blazar/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/blazar/loci-2025.1-ubuntu_noble.yaml
index 1192564cb8..717c621b05 100644
--- a/values_overrides/blazar/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/blazar/loci-2025.1-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
   tags:
-    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
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    blazar_api: quay.io/airshipit/blazar:2025.1-ubuntu_noble_loci
+    blazar_manager: quay.io/airshipit/blazar:2025.1-ubuntu_noble_loci
+    blazar_db_sync: quay.io/airshipit/blazar:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/blazar/uv-2025.2-ubuntu_noble.yaml b/values_overrides/blazar/loci-2025.2-ubuntu_noble.yaml
similarity index 79%
rename from values_overrides/blazar/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/blazar/loci-2025.2-ubuntu_noble.yaml
index 1a7889761f..ae56eba600 100644
--- a/values_overrides/blazar/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/blazar/loci-2025.2-ubuntu_noble.yaml
@@ -1,13 +1,13 @@
 ---
 images:
   tags:
-    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
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    blazar_api: quay.io/airshipit/blazar:2025.2-ubuntu_noble_loci
+    blazar_manager: quay.io/airshipit/blazar:2025.2-ubuntu_noble_loci
+    blazar_db_sync: quay.io/airshipit/blazar:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/ceph-rgw/uv-2025.1-ubuntu_noble.yaml b/values_overrides/ceph-rgw/loci-2025.1-ubuntu_noble.yaml
similarity index 94%
rename from values_overrides/ceph-rgw/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/ceph-rgw/loci-2025.1-ubuntu_noble.yaml
index e951ceac75..f7170cb94e 100644
--- a/values_overrides/ceph-rgw/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/ceph-rgw/loci-2025.1-ubuntu_noble.yaml
@@ -13,7 +13,7 @@
 ---
 images:
   tags:
-    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'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci'
 ...
diff --git a/values_overrides/ceph-rgw/uv-2025.2-ubuntu_noble.yaml b/values_overrides/ceph-rgw/loci-2025.2-ubuntu_noble.yaml
similarity index 94%
rename from values_overrides/ceph-rgw/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/ceph-rgw/loci-2025.2-ubuntu_noble.yaml
index f50c54b861..684c99a8f0 100644
--- a/values_overrides/ceph-rgw/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/ceph-rgw/loci-2025.2-ubuntu_noble.yaml
@@ -13,7 +13,7 @@
 ---
 images:
   tags:
-    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'
+    ks_endpoints: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci'
+    ks_service: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci'
+    ks_user: 'quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci'
 ...
diff --git a/values_overrides/cinder/uv-2025.1-ubuntu_noble.yaml b/values_overrides/cinder/loci-2025.1-ubuntu_noble.yaml
similarity index 82%
rename from values_overrides/cinder/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/cinder/loci-2025.1-ubuntu_noble.yaml
index 27eb2ae2a4..aa326b1d5f 100644
--- a/values_overrides/cinder/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cinder/loci-2025.1-ubuntu_noble.yaml
@@ -1,19 +1,19 @@
 ---
 images:
   tags:
-    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/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/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"
-    cinder_db_purge: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    cinder_db_sync: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    cinder_api: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_loci"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    cinder_scheduler: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_loci"
+    cinder_volume: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_loci"
+    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_loci"
+    cinder_db_purge: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_loci"
     cinder_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
-    cinder_backup: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_uv"
+    cinder_backup: "quay.io/airshipit/cinder:2025.1-ubuntu_noble_loci"
     cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
diff --git a/values_overrides/cinder/uv-2025.2-ubuntu_noble.yaml b/values_overrides/cinder/loci-2025.2-ubuntu_noble.yaml
similarity index 82%
rename from values_overrides/cinder/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/cinder/loci-2025.2-ubuntu_noble.yaml
index ea24b99b08..5106857477 100644
--- a/values_overrides/cinder/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cinder/loci-2025.2-ubuntu_noble.yaml
@@ -1,19 +1,19 @@
 ---
 images:
   tags:
-    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/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/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"
-    cinder_db_purge: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_uv"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    cinder_db_sync: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    cinder_api: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_loci"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    cinder_scheduler: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_loci"
+    cinder_volume: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_loci"
+    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_loci"
+    cinder_db_purge: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_loci"
     cinder_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
-    cinder_backup: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_uv"
+    cinder_backup: "quay.io/airshipit/cinder:2025.2-ubuntu_noble_loci"
     cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
diff --git a/values_overrides/cloudkitty/uv-2025.1-ubuntu_noble.yaml b/values_overrides/cloudkitty/loci-2025.1-ubuntu_noble.yaml
similarity index 84%
rename from values_overrides/cloudkitty/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/cloudkitty/loci-2025.1-ubuntu_noble.yaml
index 30d72c8ba5..7d12e49069 100644
--- a/values_overrides/cloudkitty/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cloudkitty/loci-2025.1-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
   tags:
-    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
-    cloudkitty_storage_init: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_loci
+    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_loci
+    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_loci
+    cloudkitty_storage_init: quay.io/airshipit/cloudkitty:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/cloudkitty/uv-2025.2-ubuntu_noble.yaml b/values_overrides/cloudkitty/loci-2025.2-ubuntu_noble.yaml
similarity index 84%
rename from values_overrides/cloudkitty/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/cloudkitty/loci-2025.2-ubuntu_noble.yaml
index 3bfd16ad07..eb03a2f7c7 100644
--- a/values_overrides/cloudkitty/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cloudkitty/loci-2025.2-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
   tags:
-    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
-    cloudkitty_storage_init: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    cloudkitty_api: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_loci
+    cloudkitty_db_sync: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_loci
+    cloudkitty_processor: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_loci
+    cloudkitty_storage_init: quay.io/airshipit/cloudkitty:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/elasticsearch/uv-2025.1-ubuntu_noble.yaml b/values_overrides/elasticsearch/loci-2025.1-ubuntu_noble.yaml
similarity index 96%
rename from values_overrides/elasticsearch/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/elasticsearch/loci-2025.1-ubuntu_noble.yaml
index 5934d2c735..a5a556722b 100644
--- a/values_overrides/elasticsearch/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/elasticsearch/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    memory_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
-    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    memory_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/elasticsearch/uv-2025.2-ubuntu_noble.yaml b/values_overrides/elasticsearch/loci-2025.2-ubuntu_noble.yaml
similarity index 96%
rename from values_overrides/elasticsearch/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/elasticsearch/loci-2025.2-ubuntu_noble.yaml
index 8c03b95209..61c6a0b539 100644
--- a/values_overrides/elasticsearch/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/elasticsearch/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    memory_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
-    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    memory_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/fluentd/uv-2025.1-ubuntu_noble.yaml b/values_overrides/fluentd/loci-2025.1-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/fluentd/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/fluentd/loci-2025.1-ubuntu_noble.yaml
index 7d33c49f0f..48384e37ff 100644
--- a/values_overrides/fluentd/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/fluentd/loci-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/prometheus/uv-2025.2-ubuntu_noble.yaml b/values_overrides/fluentd/loci-2025.2-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/prometheus/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/fluentd/loci-2025.2-ubuntu_noble.yaml
index 81e9a2ab69..76f522356f 100644
--- a/values_overrides/prometheus/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/fluentd/loci-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/freezer/uv-2025.1-ubuntu_noble.yaml b/values_overrides/freezer/loci-2025.1-ubuntu_noble.yaml
similarity index 86%
rename from values_overrides/freezer/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/freezer/loci-2025.1-ubuntu_noble.yaml
index 9132459018..94e39cb219 100644
--- a/values_overrides/freezer/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/freezer/loci-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
   tags:
-    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
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    freezer_db_sync: quay.io/airshipit/freezer-api:2025.1-ubuntu_noble_loci
+    freezer_api: quay.io/airshipit/freezer-api:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/freezer/uv-2025.2-ubuntu_noble.yaml b/values_overrides/freezer/loci-2025.2-ubuntu_noble.yaml
similarity index 86%
rename from values_overrides/freezer/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/freezer/loci-2025.2-ubuntu_noble.yaml
index 23198369b4..ec31044c5b 100644
--- a/values_overrides/freezer/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/freezer/loci-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
   tags:
-    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
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    freezer_db_sync: quay.io/airshipit/freezer-api:2025.2-ubuntu_noble_loci
+    freezer_api: quay.io/airshipit/freezer-api:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/glance/uv-2025.1-ubuntu_noble.yaml b/values_overrides/glance/loci-2025.1-ubuntu_noble.yaml
similarity index 78%
rename from values_overrides/glance/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/glance/loci-2025.1-ubuntu_noble.yaml
index 3eecca4753..e62a7006a2 100644
--- a/values_overrides/glance/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/glance/loci-2025.1-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
   tags:
-    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"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_noble_loci"
+    glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_noble_loci"
+    glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_noble_loci"
     glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
diff --git a/values_overrides/glance/uv-2025.2-ubuntu_noble.yaml b/values_overrides/glance/loci-2025.2-ubuntu_noble.yaml
similarity index 78%
rename from values_overrides/glance/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/glance/loci-2025.2-ubuntu_noble.yaml
index 475a82735b..54b8a1d783 100644
--- a/values_overrides/glance/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/glance/loci-2025.2-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
   tags:
-    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"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    glance_db_sync: "quay.io/airshipit/glance:2025.2-ubuntu_noble_loci"
+    glance_api: "quay.io/airshipit/glance:2025.2-ubuntu_noble_loci"
+    glance_metadefs_load: "quay.io/airshipit/glance:2025.2-ubuntu_noble_loci"
     glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
diff --git a/values_overrides/grafana/uv-2025.1-ubuntu_noble.yaml b/values_overrides/grafana/loci-2025.1-ubuntu_noble.yaml
similarity index 95%
rename from values_overrides/grafana/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/grafana/loci-2025.1-ubuntu_noble.yaml
index 2e2df74d0b..425305f4df 100644
--- a/values_overrides/grafana/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/grafana/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/grafana/uv-2025.2-ubuntu_noble.yaml b/values_overrides/grafana/loci-2025.2-ubuntu_noble.yaml
similarity index 95%
rename from values_overrides/grafana/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/grafana/loci-2025.2-ubuntu_noble.yaml
index 184283ef04..3aef1f0e47 100644
--- a/values_overrides/grafana/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/grafana/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/heat/loci-2025.1-ubuntu_noble.yaml b/values_overrides/heat/loci-2025.1-ubuntu_noble.yaml
new file mode 100644
index 0000000000..34b58bb39c
--- /dev/null
+++ b/values_overrides/heat/loci-2025.1-ubuntu_noble.yaml
@@ -0,0 +1,16 @@
+---
+images:
+  tags:
+    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    heat_engine: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    heat_engine_cleaner: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+    heat_purge_deleted: "quay.io/airshipit/heat:2025.1-ubuntu_noble_loci"
+...
diff --git a/values_overrides/heat/loci-2025.2-ubuntu_noble.yaml b/values_overrides/heat/loci-2025.2-ubuntu_noble.yaml
new file mode 100644
index 0000000000..fa2164aba1
--- /dev/null
+++ b/values_overrides/heat/loci-2025.2-ubuntu_noble.yaml
@@ -0,0 +1,16 @@
+---
+images:
+  tags:
+    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    heat_db_sync: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    heat_api: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    heat_cfn: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    heat_engine: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    heat_engine_cleaner: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+    heat_purge_deleted: "quay.io/airshipit/heat:2025.2-ubuntu_noble_loci"
+...
diff --git a/values_overrides/heat/uv-2025.1-ubuntu_noble.yaml b/values_overrides/heat/uv-2025.1-ubuntu_noble.yaml
deleted file mode 100644
index b9aeb9b6ad..0000000000
--- a/values_overrides/heat/uv-2025.1-ubuntu_noble.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-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"
-    heat_db_sync: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    heat_api: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    heat_cfn: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    heat_engine: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    heat_engine_cleaner: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-    heat_purge_deleted: "quay.io/airshipit/heat:2025.1-ubuntu_noble_uv"
-...
diff --git a/values_overrides/heat/uv-2025.2-ubuntu_noble.yaml b/values_overrides/heat/uv-2025.2-ubuntu_noble.yaml
deleted file mode 100644
index bb4f7c19b3..0000000000
--- a/values_overrides/heat/uv-2025.2-ubuntu_noble.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-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"
-    heat_db_sync: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    heat_api: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    heat_cfn: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    heat_engine: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    heat_engine_cleaner: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-    heat_purge_deleted: "quay.io/airshipit/heat:2025.2-ubuntu_noble_uv"
-...
diff --git a/values_overrides/horizon/uv-2025.1-ubuntu_noble.yaml b/values_overrides/horizon/loci-2025.1-ubuntu_noble.yaml
similarity index 70%
rename from values_overrides/horizon/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/horizon/loci-2025.1-ubuntu_noble.yaml
index be8cbc73f2..59115dcef8 100644
--- a/values_overrides/horizon/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/horizon/loci-2025.1-ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
   tags:
-    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
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    horizon_db_sync: quay.io/airshipit/horizon:2025.1-ubuntu_noble_loci
+    horizon: quay.io/airshipit/horizon:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/horizon/uv-2025.2-ubuntu_noble.yaml b/values_overrides/horizon/loci-2025.2-ubuntu_noble.yaml
similarity index 70%
rename from values_overrides/horizon/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/horizon/loci-2025.2-ubuntu_noble.yaml
index 376ae9d176..238363f2c5 100644
--- a/values_overrides/horizon/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/horizon/loci-2025.2-ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
   tags:
-    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
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    horizon_db_sync: quay.io/airshipit/horizon:2025.2-ubuntu_noble_loci
+    horizon: quay.io/airshipit/horizon:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/keystone/uv-2025.1-ubuntu_noble.yaml b/values_overrides/keystone/loci-2025.1-ubuntu_noble.yaml
similarity index 81%
rename from values_overrides/keystone/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/keystone/loci-2025.1-ubuntu_noble.yaml
index 2769f47ec5..e418f1488f 100644
--- a/values_overrides/keystone/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/keystone/loci-2025.1-ubuntu_noble.yaml
@@ -1,16 +1,16 @@
 ---
 images:
   tags:
-    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/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/openstack-client:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    keystone_api: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_loci"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    keystone_credential_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_loci"
+    keystone_credential_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_loci"
+    keystone_db_sync: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_loci"
+    keystone_domain_manage: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_loci"
+    keystone_fernet_rotate: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_loci"
+    keystone_fernet_setup: "quay.io/airshipit/keystone:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
 ...
diff --git a/values_overrides/keystone/uv-2025.2-ubuntu_noble.yaml b/values_overrides/keystone/loci-2025.2-ubuntu_noble.yaml
similarity index 81%
rename from values_overrides/keystone/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/keystone/loci-2025.2-ubuntu_noble.yaml
index 39d72ff111..a99317fa9e 100644
--- a/values_overrides/keystone/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/keystone/loci-2025.2-ubuntu_noble.yaml
@@ -1,16 +1,16 @@
 ---
 images:
   tags:
-    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/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/openstack-client:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    keystone_api: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_loci"
+    keystone_bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    keystone_credential_rotate: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_loci"
+    keystone_credential_setup: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_loci"
+    keystone_db_sync: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_loci"
+    keystone_domain_manage: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_loci"
+    keystone_fernet_rotate: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_loci"
+    keystone_fernet_setup: "quay.io/airshipit/keystone:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
 ...
diff --git a/values_overrides/kibana/uv-2025.1-ubuntu_noble.yaml b/values_overrides/kibana/loci-2025.1-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/kibana/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/kibana/loci-2025.1-ubuntu_noble.yaml
index 06d071a55d..9d087218ad 100644
--- a/values_overrides/kibana/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/kibana/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/kibana/uv-2025.2-ubuntu_noble.yaml b/values_overrides/kibana/loci-2025.2-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/kibana/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/kibana/loci-2025.2-ubuntu_noble.yaml
index 14234b82ef..a727e085b6 100644
--- a/values_overrides/kibana/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/kibana/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    register_kibana_indexes: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    flush_kibana_metadata: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/kubernetes-keystone-webhook/uv-2025.1-ubuntu_noble.yaml b/values_overrides/kubernetes-keystone-webhook/loci-2025.1-ubuntu_noble.yaml
similarity index 97%
rename from values_overrides/kubernetes-keystone-webhook/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/kubernetes-keystone-webhook/loci-2025.1-ubuntu_noble.yaml
index 34bab8b4dc..b2c6eb2693 100644
--- a/values_overrides/kubernetes-keystone-webhook/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/loci-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    scripted_test: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/kubernetes-keystone-webhook/uv-2025.2-ubuntu_noble.yaml b/values_overrides/kubernetes-keystone-webhook/loci-2025.2-ubuntu_noble.yaml
similarity index 97%
rename from values_overrides/kubernetes-keystone-webhook/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/kubernetes-keystone-webhook/loci-2025.2-ubuntu_noble.yaml
index 117e2ca493..853ff3d614 100644
--- a/values_overrides/kubernetes-keystone-webhook/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/loci-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    scripted_test: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    scripted_test: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/manila/uv-2025.1-ubuntu_noble.yaml b/values_overrides/manila/loci-2025.1-ubuntu_noble.yaml
similarity index 72%
rename from values_overrides/manila/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/manila/loci-2025.1-ubuntu_noble.yaml
index a2ac995a6b..5c60e3967a 100644
--- a/values_overrides/manila/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/manila/loci-2025.1-ubuntu_noble.yaml
@@ -1,18 +1,18 @@
 ---
 images:
   tags:
-    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
     dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    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/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
-    manila_share: quay.io/airshipit/manila:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    manila_db_sync: quay.io/airshipit/manila:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    manila_api: quay.io/airshipit/manila:2025.1-ubuntu_noble_loci
+    manila_data: quay.io/airshipit/manila:2025.1-ubuntu_noble_loci
+    manila_scheduler: quay.io/airshipit/manila:2025.1-ubuntu_noble_loci
+    manila_share: quay.io/airshipit/manila:2025.1-ubuntu_noble_loci
 conf:
   manila_api_uwsgi:
     uwsgi:
diff --git a/values_overrides/manila/uv-2025.2-ubuntu_noble.yaml b/values_overrides/manila/loci-2025.2-ubuntu_noble.yaml
similarity index 72%
rename from values_overrides/manila/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/manila/loci-2025.2-ubuntu_noble.yaml
index 045c4b98af..37a4d0a6a9 100644
--- a/values_overrides/manila/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/manila/loci-2025.2-ubuntu_noble.yaml
@@ -1,18 +1,18 @@
 ---
 images:
   tags:
-    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
     dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    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/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
-    manila_share: quay.io/airshipit/manila:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    manila_db_sync: quay.io/airshipit/manila:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    manila_api: quay.io/airshipit/manila:2025.2-ubuntu_noble_loci
+    manila_data: quay.io/airshipit/manila:2025.2-ubuntu_noble_loci
+    manila_scheduler: quay.io/airshipit/manila:2025.2-ubuntu_noble_loci
+    manila_share: quay.io/airshipit/manila:2025.2-ubuntu_noble_loci
 conf:
   manila_api_uwsgi:
     uwsgi:
diff --git a/values_overrides/mariadb-backup/uv-2025.1-ubuntu_noble.yaml b/values_overrides/mariadb-backup/loci-2025.1-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/mariadb-backup/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/mariadb-backup/loci-2025.1-ubuntu_noble.yaml
index 3e47168845..d866b43c3d 100644
--- a/values_overrides/mariadb-backup/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-backup/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/mariadb/uv-2025.2-ubuntu_noble.yaml b/values_overrides/mariadb-backup/loci-2025.2-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/mariadb/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/mariadb-backup/loci-2025.2-ubuntu_noble.yaml
index afea92b99d..0ba70282c1 100644
--- a/values_overrides/mariadb/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-backup/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/mariadb/uv-2025.1-ubuntu_noble.yaml b/values_overrides/mariadb-cluster/loci-2025.1-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/mariadb/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/mariadb-cluster/loci-2025.1-ubuntu_noble.yaml
index 3e47168845..d866b43c3d 100644
--- a/values_overrides/mariadb/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-cluster/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/mariadb-backup/uv-2025.2-ubuntu_noble.yaml b/values_overrides/mariadb-cluster/loci-2025.2-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/mariadb-backup/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/mariadb-cluster/loci-2025.2-ubuntu_noble.yaml
index afea92b99d..0ba70282c1 100644
--- a/values_overrides/mariadb-backup/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/mariadb-cluster/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/mariadb-cluster/uv-2025.1-ubuntu_noble.yaml b/values_overrides/mariadb/loci-2025.1-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/mariadb-cluster/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/mariadb/loci-2025.1-ubuntu_noble.yaml
index 3e47168845..d866b43c3d 100644
--- a/values_overrides/mariadb-cluster/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/mariadb/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/prometheus-mysql-exporter/uv-2025.2-ubuntu_noble.yaml b/values_overrides/mariadb/loci-2025.2-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/prometheus-mysql-exporter/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/mariadb/loci-2025.2-ubuntu_noble.yaml
index afea92b99d..0ba70282c1 100644
--- a/values_overrides/prometheus-mysql-exporter/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/mariadb/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/neutron/uv-2025.1-ubuntu_noble.yaml b/values_overrides/neutron/loci-2025.1-ubuntu_noble.yaml
similarity index 79%
rename from values_overrides/neutron/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/neutron/loci-2025.1-ubuntu_noble.yaml
index 290603db88..689ca20798 100644
--- a/values_overrides/neutron/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/neutron/loci-2025.1-ubuntu_noble.yaml
@@ -1,22 +1,22 @@
 ---
 images:
   tags:
-    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"
-    neutron_l2gw: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_ovn_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_openvswitch_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_server: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_rpc_server: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_bagpipe_bgp: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
-    neutron_netns_cleanup_cron: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    neutron_db_sync: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_dhcp: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_l3: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_l2gw: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_ovn_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_openvswitch_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_server: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_rpc_server: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_bagpipe_bgp: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
+    neutron_netns_cleanup_cron: "quay.io/airshipit/neutron:2025.1-ubuntu_noble_loci"
 ...
diff --git a/values_overrides/neutron/uv-2025.2-ubuntu_noble.yaml b/values_overrides/neutron/loci-2025.2-ubuntu_noble.yaml
similarity index 79%
rename from values_overrides/neutron/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/neutron/loci-2025.2-ubuntu_noble.yaml
index 9371ee94f0..a56c110dc1 100644
--- a/values_overrides/neutron/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/neutron/loci-2025.2-ubuntu_noble.yaml
@@ -1,22 +1,22 @@
 ---
 images:
   tags:
-    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"
-    neutron_l2gw: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_metadata: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_ovn_metadata: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_openvswitch_agent: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_server: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_rpc_server: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_bagpipe_bgp: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
-    neutron_netns_cleanup_cron: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    neutron_db_sync: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_dhcp: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_l3: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_l2gw: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_metadata: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_ovn_metadata: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_openvswitch_agent: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_server: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_rpc_server: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_bagpipe_bgp: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
+    neutron_netns_cleanup_cron: "quay.io/airshipit/neutron:2025.2-ubuntu_noble_loci"
 ...
diff --git a/values_overrides/nova/uv-2025.1-ubuntu_noble.yaml b/values_overrides/nova/loci-2025.1-ubuntu_noble.yaml
similarity index 74%
rename from values_overrides/nova/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/nova/loci-2025.1-ubuntu_noble.yaml
index df16db4bb0..049c92e436 100644
--- a/values_overrides/nova/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/nova/loci-2025.1-ubuntu_noble.yaml
@@ -1,23 +1,23 @@
 ---
 images:
   tags:
-    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/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"
-    nova_db_sync: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
-    nova_novncproxy: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
-    nova_novncproxy_assets: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
-    nova_scheduler: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
-    nova_spiceproxy: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
-    nova_spiceproxy_assets: "quay.io/airshipit/nova:2025.1-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    nova_api: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_cell_setup: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_cell_setup_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    nova_compute: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_compute_ssh: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_conductor: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_db_sync: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_novncproxy: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_novncproxy_assets: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_scheduler: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_spiceproxy: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
+    nova_spiceproxy_assets: "quay.io/airshipit/nova:2025.1-ubuntu_noble_loci"
     nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
diff --git a/values_overrides/nova/uv-2025.2-ubuntu_noble.yaml b/values_overrides/nova/loci-2025.2-ubuntu_noble.yaml
similarity index 74%
rename from values_overrides/nova/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/nova/loci-2025.2-ubuntu_noble.yaml
index fd12e8eb58..2552ccb804 100644
--- a/values_overrides/nova/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/nova/loci-2025.2-ubuntu_noble.yaml
@@ -1,23 +1,23 @@
 ---
 images:
   tags:
-    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/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"
-    nova_db_sync: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
-    nova_novncproxy: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
-    nova_novncproxy_assets: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
-    nova_scheduler: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
-    nova_spiceproxy: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
-    nova_spiceproxy_assets: "quay.io/airshipit/nova:2025.2-ubuntu_noble_uv"
+    bootstrap: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    nova_api: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_cell_setup: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_cell_setup_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    nova_compute: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_compute_ssh: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_conductor: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_db_sync: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_novncproxy: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_novncproxy_assets: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_scheduler: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_spiceproxy: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
+    nova_spiceproxy_assets: "quay.io/airshipit/nova:2025.2-ubuntu_noble_loci"
     nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
diff --git a/values_overrides/octavia/uv-2025.1-ubuntu_noble.yaml b/values_overrides/octavia/loci-2025.1-ubuntu_noble.yaml
similarity index 84%
rename from values_overrides/octavia/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/octavia/loci-2025.1-ubuntu_noble.yaml
index b7c891ba1b..62bd347a6c 100644
--- a/values_overrides/octavia/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/octavia/loci-2025.1-ubuntu_noble.yaml
@@ -2,23 +2,23 @@
 images:
   tags:
     test: docker.io/xrally/xrally-openstack:2.0.0
-    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/openstack-client:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    octavia_db_sync: quay.io/airshipit/octavia:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
     rabbit_init: docker.io/rabbitmq:3.13-management
-    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
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
     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
-    octavia_driver_agent: quay.io/airshipit/octavia:2025.1-ubuntu_noble_uv
-    octavia_worker: quay.io/airshipit/octavia:2025.1-ubuntu_noble_uv
-    octavia_worker_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
-    octavia_housekeeping: quay.io/airshipit/octavia:2025.1-ubuntu_noble_uv
-    octavia_health_manager: quay.io/airshipit/octavia:2025.1-ubuntu_noble_uv
-    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    octavia_api: quay.io/airshipit/octavia:2025.1-ubuntu_noble_loci
+    octavia_driver_agent: quay.io/airshipit/octavia:2025.1-ubuntu_noble_loci
+    octavia_worker: quay.io/airshipit/octavia:2025.1-ubuntu_noble_loci
+    octavia_worker_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    octavia_housekeeping: quay.io/airshipit/octavia:2025.1-ubuntu_noble_loci
+    octavia_health_manager: quay.io/airshipit/octavia:2025.1-ubuntu_noble_loci
+    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
     openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble
 conf:
   octavia_api_uwsgi:
diff --git a/values_overrides/octavia/uv-2025.2-ubuntu_noble.yaml b/values_overrides/octavia/loci-2025.2-ubuntu_noble.yaml
similarity index 84%
rename from values_overrides/octavia/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/octavia/loci-2025.2-ubuntu_noble.yaml
index e8cdc19c6f..53a7097cda 100644
--- a/values_overrides/octavia/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/octavia/loci-2025.2-ubuntu_noble.yaml
@@ -2,23 +2,23 @@
 images:
   tags:
     test: docker.io/xrally/xrally-openstack:2.0.0
-    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/openstack-client:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    octavia_db_sync: quay.io/airshipit/octavia:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
     rabbit_init: docker.io/rabbitmq:3.13-management
-    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
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
     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
-    octavia_driver_agent: quay.io/airshipit/octavia:2025.2-ubuntu_noble_uv
-    octavia_worker: quay.io/airshipit/octavia:2025.2-ubuntu_noble_uv
-    octavia_worker_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
-    octavia_housekeeping: quay.io/airshipit/octavia:2025.2-ubuntu_noble_uv
-    octavia_health_manager: quay.io/airshipit/octavia:2025.2-ubuntu_noble_uv
-    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    octavia_api: quay.io/airshipit/octavia:2025.2-ubuntu_noble_loci
+    octavia_driver_agent: quay.io/airshipit/octavia:2025.2-ubuntu_noble_loci
+    octavia_worker: quay.io/airshipit/octavia:2025.2-ubuntu_noble_loci
+    octavia_worker_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    octavia_housekeeping: quay.io/airshipit/octavia:2025.2-ubuntu_noble_loci
+    octavia_health_manager: quay.io/airshipit/octavia:2025.2-ubuntu_noble_loci
+    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
     openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble
 conf:
   octavia_api_uwsgi:
diff --git a/values_overrides/placement/uv-2025.1-ubuntu_noble.yaml b/values_overrides/placement/loci-2025.1-ubuntu_noble.yaml
similarity index 89%
rename from values_overrides/placement/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/placement/loci-2025.1-ubuntu_noble.yaml
index d5e8dee196..47ae437a8f 100644
--- a/values_overrides/placement/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/placement/loci-2025.1-ubuntu_noble.yaml
@@ -2,13 +2,13 @@
 images:
   pull_policy: IfNotPresent
   tags:
-    placement: "quay.io/airshipit/placement: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"
+    placement: "quay.io/airshipit/placement:2025.1-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci"
+    placement_db_sync: "quay.io/airshipit/placement:2025.1-ubuntu_noble_loci"
     dep_check: "quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy"
     image_repo_sync: "docker.io/docker:17.07.0"
 dependencies:
diff --git a/values_overrides/placement/uv-2025.2-ubuntu_noble.yaml b/values_overrides/placement/loci-2025.2-ubuntu_noble.yaml
similarity index 89%
rename from values_overrides/placement/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/placement/loci-2025.2-ubuntu_noble.yaml
index 08578edaf1..7e406ee3bb 100644
--- a/values_overrides/placement/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/placement/loci-2025.2-ubuntu_noble.yaml
@@ -2,13 +2,13 @@
 images:
   pull_policy: IfNotPresent
   tags:
-    placement: "quay.io/airshipit/placement: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"
+    placement: "quay.io/airshipit/placement:2025.2-ubuntu_noble_loci"
+    ks_user: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_service: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    ks_endpoints: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_init: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    db_drop: "quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci"
+    placement_db_sync: "quay.io/airshipit/placement:2025.2-ubuntu_noble_loci"
     dep_check: "quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy"
     image_repo_sync: "docker.io/docker:17.07.0"
 dependencies:
diff --git a/values_overrides/postgresql/uv-2025.1-ubuntu_noble.yaml b/values_overrides/postgresql/loci-2025.1-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/postgresql/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/postgresql/loci-2025.1-ubuntu_noble.yaml
index 678073dbcf..14920d355a 100644
--- a/values_overrides/postgresql/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/postgresql/loci-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/postgresql/uv-2025.2-ubuntu_noble.yaml b/values_overrides/postgresql/loci-2025.2-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/postgresql/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/postgresql/loci-2025.2-ubuntu_noble.yaml
index d887c855d9..684638f39b 100644
--- a/values_overrides/postgresql/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/postgresql/loci-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/powerdns/uv-2025.1-ubuntu_noble.yaml b/values_overrides/powerdns/loci-2025.1-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/powerdns/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/powerdns/loci-2025.1-ubuntu_noble.yaml
index c14dde7a32..2fc91b168f 100644
--- a/values_overrides/powerdns/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/powerdns/loci-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/powerdns/uv-2025.2-ubuntu_noble.yaml b/values_overrides/powerdns/loci-2025.2-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/powerdns/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/powerdns/loci-2025.2-ubuntu_noble.yaml
index 9d7f232da4..ad958fdb86 100644
--- a/values_overrides/powerdns/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/powerdns/loci-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/prometheus-mysql-exporter/uv-2025.1-ubuntu_noble.yaml b/values_overrides/prometheus-mysql-exporter/loci-2025.1-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/prometheus-mysql-exporter/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/prometheus-mysql-exporter/loci-2025.1-ubuntu_noble.yaml
index 3e47168845..d866b43c3d 100644
--- a/values_overrides/prometheus-mysql-exporter/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/prometheus-mysql-exporter/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/mariadb-cluster/uv-2025.2-ubuntu_noble.yaml b/values_overrides/prometheus-mysql-exporter/loci-2025.2-ubuntu_noble.yaml
similarity index 93%
rename from values_overrides/mariadb-cluster/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/prometheus-mysql-exporter/loci-2025.2-ubuntu_noble.yaml
index afea92b99d..0ba70282c1 100644
--- a/values_overrides/mariadb-cluster/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/prometheus-mysql-exporter/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/prometheus/uv-2025.1-ubuntu_noble.yaml b/values_overrides/prometheus/loci-2025.1-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/prometheus/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/prometheus/loci-2025.1-ubuntu_noble.yaml
index 7d33c49f0f..48384e37ff 100644
--- a/values_overrides/prometheus/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/prometheus/loci-2025.1-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/fluentd/uv-2025.2-ubuntu_noble.yaml b/values_overrides/prometheus/loci-2025.2-ubuntu_noble.yaml
similarity index 98%
rename from values_overrides/fluentd/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/prometheus/loci-2025.2-ubuntu_noble.yaml
index 81e9a2ab69..76f522356f 100644
--- a/values_overrides/fluentd/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/prometheus/loci-2025.2-ubuntu_noble.yaml
@@ -13,5 +13,5 @@
 ---
 images:
   tags:
-    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/rabbitmq/uv-2025.1-ubuntu_noble.yaml b/values_overrides/rabbitmq/loci-2025.1-ubuntu_noble.yaml
similarity index 92%
rename from values_overrides/rabbitmq/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/rabbitmq/loci-2025.1-ubuntu_noble.yaml
index 499b0438fb..2b97ba8e3c 100644
--- a/values_overrides/rabbitmq/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/rabbitmq/loci-2025.1-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    rabbitmq_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/rabbitmq/uv-2025.2-ubuntu_noble.yaml b/values_overrides/rabbitmq/loci-2025.2-ubuntu_noble.yaml
similarity index 92%
rename from values_overrides/rabbitmq/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/rabbitmq/loci-2025.2-ubuntu_noble.yaml
index 2dc9d7fa2b..0aa825a3de 100644
--- a/values_overrides/rabbitmq/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/rabbitmq/loci-2025.2-ubuntu_noble.yaml
@@ -13,6 +13,6 @@
 ---
 images:
   tags:
-    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
+    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    rabbitmq_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/skyline/uv-2025.2-ubuntu_noble.yaml b/values_overrides/skyline/loci-2025.2-ubuntu_noble.yaml
similarity index 78%
rename from values_overrides/skyline/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/skyline/loci-2025.2-ubuntu_noble.yaml
index 366a42b528..1bfab6190f 100644
--- a/values_overrides/skyline/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/skyline/loci-2025.2-ubuntu_noble.yaml
@@ -1,10 +1,10 @@
 ---
 images:
   tags:
-    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/openstack-client:2025.2-ubuntu_noble_uv
+    skyline_db_sync: quay.io/airshipit/skyline:2025.2-ubuntu_noble_loci
+    skyline: quay.io/airshipit/skyline:2025.2-ubuntu_noble_loci
+    skyline_nginx: quay.io/airshipit/skyline:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
-    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_uv
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/tacker/uv-2025.1-ubuntu_noble.yaml b/values_overrides/tacker/loci-2025.1-ubuntu_noble.yaml
similarity index 90%
rename from values_overrides/tacker/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/tacker/loci-2025.1-ubuntu_noble.yaml
index 3d049db3fc..bf77625895 100644
--- a/values_overrides/tacker/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/tacker/loci-2025.1-ubuntu_noble.yaml
@@ -4,12 +4,12 @@
 ---
 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/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/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
+    tacker_server: quay.io/airshipit/tacker:2025.1-ubuntu_noble_loci
+    tacker_conductor: quay.io/airshipit/tacker:2025.1-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    tacker_db_sync: quay.io/airshipit/tacker:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/tacker/uv-2025.2-ubuntu_noble.yaml b/values_overrides/tacker/loci-2025.2-ubuntu_noble.yaml
similarity index 90%
rename from values_overrides/tacker/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/tacker/loci-2025.2-ubuntu_noble.yaml
index 99d60fae9f..33aaa5fda1 100644
--- a/values_overrides/tacker/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/tacker/loci-2025.2-ubuntu_noble.yaml
@@ -4,12 +4,12 @@
 ---
 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/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/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
+    tacker_server: quay.io/airshipit/tacker:2025.2-ubuntu_noble_loci
+    tacker_conductor: quay.io/airshipit/tacker:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    tacker_db_sync: quay.io/airshipit/tacker:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/watcher/uv-2025.1-ubuntu_noble.yaml b/values_overrides/watcher/loci-2025.1-ubuntu_noble.yaml
similarity index 78%
rename from values_overrides/watcher/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/watcher/loci-2025.1-ubuntu_noble.yaml
index e2329e0b0e..617a1c5a22 100644
--- a/values_overrides/watcher/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/watcher/loci-2025.1-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
   tags:
-    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
-    watcher_db_sync: quay.io/airshipit/watcher:2025.1-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    watcher_api: quay.io/airshipit/watcher:2025.1-ubuntu_noble_loci
+    watcher_decision_engine: quay.io/airshipit/watcher:2025.1-ubuntu_noble_loci
+    watcher_applier: quay.io/airshipit/watcher:2025.1-ubuntu_noble_loci
+    watcher_db_sync: quay.io/airshipit/watcher:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/watcher/uv-2025.2-ubuntu_noble.yaml b/values_overrides/watcher/loci-2025.2-ubuntu_noble.yaml
similarity index 78%
rename from values_overrides/watcher/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/watcher/loci-2025.2-ubuntu_noble.yaml
index 4a667fa05c..fd5d85cf6a 100644
--- a/values_overrides/watcher/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/watcher/loci-2025.2-ubuntu_noble.yaml
@@ -1,14 +1,14 @@
 ---
 images:
   tags:
-    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
-    watcher_db_sync: quay.io/airshipit/watcher:2025.2-ubuntu_noble_uv
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    watcher_api: quay.io/airshipit/watcher:2025.2-ubuntu_noble_loci
+    watcher_decision_engine: quay.io/airshipit/watcher:2025.2-ubuntu_noble_loci
+    watcher_applier: quay.io/airshipit/watcher:2025.2-ubuntu_noble_loci
+    watcher_db_sync: quay.io/airshipit/watcher:2025.2-ubuntu_noble_loci
 ...
diff --git a/values_overrides/zaqar/uv-2025.1-ubuntu_noble.yaml b/values_overrides/zaqar/loci-2025.1-ubuntu_noble.yaml
similarity index 67%
rename from values_overrides/zaqar/uv-2025.1-ubuntu_noble.yaml
rename to values_overrides/zaqar/loci-2025.1-ubuntu_noble.yaml
index 869428ba83..24d70ae251 100644
--- a/values_overrides/zaqar/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/zaqar/loci-2025.1-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
   tags:
-    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
+    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble_loci
+    zaqar_api: quay.io/airshipit/zaqar:2025.1-ubuntu_noble_loci
+    zaqar_db_sync: quay.io/airshipit/zaqar:2025.1-ubuntu_noble_loci
 ...
diff --git a/values_overrides/zaqar/uv-2025.2-ubuntu_noble.yaml b/values_overrides/zaqar/loci-2025.2-ubuntu_noble.yaml
similarity index 67%
rename from values_overrides/zaqar/uv-2025.2-ubuntu_noble.yaml
rename to values_overrides/zaqar/loci-2025.2-ubuntu_noble.yaml
index 5020809b32..8f9f7ee47d 100644
--- a/values_overrides/zaqar/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/zaqar/loci-2025.2-ubuntu_noble.yaml
@@ -1,12 +1,12 @@
 ---
 images:
   tags:
-    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
+    bootstrap: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    db_drop: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_user: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_service: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble_loci
+    zaqar_api: quay.io/airshipit/zaqar:2025.2-ubuntu_noble_loci
+    zaqar_db_sync: quay.io/airshipit/zaqar:2025.2-ubuntu_noble_loci
 ...
diff --git a/zuul.d/2025.1.yaml b/zuul.d/2025.1.yaml
index 7b08eae856..3282ed6e30 100644
--- a/zuul.d/2025.1.yaml
+++ b/zuul.d/2025.1.yaml
@@ -78,7 +78,7 @@
         feature_gates: gateway
 
 - job:
-    name: openstack-helm-cinder-2025-1-ubuntu_noble_uv
+    name: openstack-helm-cinder-2025-1-ubuntu_noble_loci
     parent: openstack-helm-cinder-rook
     nodeset: openstack-helm-5nodes-ubuntu_noble
     vars:
@@ -86,7 +86,7 @@
         openstack_release: "2025.1"
         container_distro_name: ubuntu
         container_distro_version: noble
-        feature_gates: uv,gateway
+        feature_gates: loci,gateway
 
 - job:
     name: openstack-helm-trove-2025-1-ubuntu_noble
@@ -111,7 +111,7 @@
         feature_gates: gateway
 
 - job:
-    name: openstack-helm-compute-kit-2025-1-ubuntu_noble_uv
+    name: openstack-helm-compute-kit-2025-1-ubuntu_noble_loci
     parent: openstack-helm-compute-kit
     nodeset: openstack-helm-3nodes-ubuntu_noble
     vars:
@@ -119,7 +119,7 @@
         openstack_release: "2025.1"
         container_distro_name: ubuntu
         container_distro_version: noble
-        feature_gates: uv,gateway
+        feature_gates: loci,gateway
 
 - job:
     name: openstack-helm-octavia-2025-1-ubuntu_jammy
diff --git a/zuul.d/2025.2-ubuntu_noble.yaml b/zuul.d/2025.2-ubuntu_noble.yaml
index 5c21311f1a..a937b27dbe 100644
--- a/zuul.d/2025.2-ubuntu_noble.yaml
+++ b/zuul.d/2025.2-ubuntu_noble.yaml
@@ -23,7 +23,7 @@
         feature_gates: gateway
 
 - job:
-    name: openstack-helm-cinder-2025-2-ubuntu_noble_uv
+    name: openstack-helm-cinder-2025-2-ubuntu_noble_loci
     parent: openstack-helm-cinder-rook
     nodeset: openstack-helm-5nodes-ubuntu_noble
     vars:
@@ -31,7 +31,7 @@
         openstack_release: "2025.2"
         container_distro_name: ubuntu
         container_distro_version: noble
-        feature_gates: uv,gateway
+        feature_gates: loci,gateway
 
 - job:
     name: openstack-helm-trove-2025-2-ubuntu_noble
@@ -56,7 +56,7 @@
         feature_gates: gateway
 
 - job:
-    name: openstack-helm-compute-kit-2025-2-ubuntu_noble_uv
+    name: openstack-helm-compute-kit-2025-2-ubuntu_noble_loci
     parent: openstack-helm-compute-kit
     nodeset: openstack-helm-3nodes-ubuntu_noble
     vars:
@@ -64,7 +64,7 @@
         openstack_release: "2025.2"
         container_distro_name: ubuntu
         container_distro_version: noble
-        feature_gates: uv,gateway
+        feature_gates: loci,gateway
 
 - job:
     name: openstack-helm-compute-kit-ovn-2025-2-ubuntu_noble