Move infra images to quay.io/airshipit

We recently moved all the infra images to quay. See Depends-On* references. Also cleanup outdated overrides. Depends-On: I41bb88dc1e0fd06896865834fd8d118f432d5be2 Depends-On: I9bfd8e559aa31e0d33a5db37385df0b3fff12000 Depends-On: I2e1699e5e8797a0d3ae2a7ac7f3b18f340290d6e Change-Id: I711ac4fd3d4e22f7f1db99a6d9f509cbe66bdc4e Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
2026-01-16 10:33:06 -06:00
parent a12bf5d3b5
commit 5bf7cf0195
98 changed files with 111 additions and 678 deletions
--- a/fluentd/values.yaml
+++ b/fluentd/values.yaml
@@ -24,7 +24,7 @@ labels:

 images:
  tags:
-    fluentd: docker.io/openstackhelm/fluentd:latest-debian
+    fluentd: quay.io/airshipit/fluentd:latest-debian
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    image_repo_sync: quay.io/airshipit/docker:27.5.0
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -43,9 +43,9 @@ images:
    # an indexer
    db_init: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
    db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
-    ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    ks_service: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    ks_endpoints: docker.io/openstackhelm/heat:newton-ubuntu_xenial
+    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
+    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    gnocchi_api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
    gnocchi_statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3
    gnocchi_metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3
--- a/grafana/templates/bin/_grafana.sh.tpl
+++ b/grafana/templates/bin/_grafana.sh.tpl
@@ -41,14 +41,14 @@ function run_migrator () {
  STOP_FLAG=$(mktemp)
  echo "Making sure the database is reachable...."
  set +e
-  until mysql ${MYSQL_PARAMS} grafana -e "select 1;"
+  until mariadb ${MYSQL_PARAMS} grafana -e "select 1;"
  do
    echo \"Database ${DB_HOST} is not reachable. Sleeping for 10 seconds...\"
    sleep 10
  done
  set -e
  echo "Preparing initial database backup..."
-  mysqldump ${MYSQL_PARAMS} --add-drop-table --quote-names grafana > "${BACKUP_FILE}"
+  mariadb-dump ${MYSQL_PARAMS} --add-drop-table --quote-names grafana > "${BACKUP_FILE}"
  echo "Backup SQL file ${BACKUP_FILE}"
  ls -lh "${BACKUP_FILE}"
  {
@@ -87,7 +87,7 @@ function run_migrator () {
      set -e
      echo "Making sure the database is reachable...."
      set +e
-      until mysql ${MYSQL_PARAMS} grafana -e "select 1;"
+      until mariadb ${MYSQL_PARAMS} grafana -e "select 1;"
      do
        echo \"Database ${DB_HOST} is not reachable. Sleeping for 10 seconds...\"
        sleep 10
@@ -95,15 +95,15 @@ function run_migrator () {
      set -e
      echo "Cleaning the database..."
      TABLES=$(
-        mysql ${MYSQL_PARAMS} grafana -e "show tables\G;" | grep Tables | cut -d " " -f 2
+        mariadb ${MYSQL_PARAMS} grafana -e "show tables\G;" | grep Tables | cut -d " " -f 2
      )
      for TABLE in ${TABLES}
      do
        echo ${TABLE}
-        mysql ${MYSQL_PARAMS} grafana -e "drop table ${TABLE};"
+        mariadb ${MYSQL_PARAMS} grafana -e "drop table ${TABLE};"
      done
      echo "Restoring the database backup..."
-      mysql ${MYSQL_PARAMS} grafana < "${BACKUP_FILE}"
+      mariadb ${MYSQL_PARAMS} grafana < "${BACKUP_FILE}"
      echo "Removing lock file ${STOP_FLAG} ..."
      rm -f "${STOP_FLAG}"
      echo "${STOP_FLAG} has been removed"
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -18,11 +18,11 @@
 images:
  tags:
    grafana: docker.io/grafana/grafana:9.2.10
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
+    mariadb: quay.io/airshipit/mariadb:latest-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    grafana_db_session_sync: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_jammy
+    selenium_tests: quay.io/airshipit/osh-selenium:latest-ubuntu_noble
    image_repo_sync: quay.io/airshipit/docker:27.5.0
    grafana_image_renderer: docker.io/grafana/grafana-image-renderer:3.10.5
  pull_policy: IfNotPresent
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -22,7 +22,7 @@ images:
    horizon_db_sync: quay.io/airshipit/horizon:2025.1-ubuntu_noble
    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    horizon: quay.io/airshipit/horizon:2025.1-ubuntu_noble
-    test: docker.io/openstackhelm/osh-selenium:latest-ubuntu_jammy
+    test: quay.io/airshipit/osh-selenium:latest-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: docker.io/docker:17.07.0
  pull_policy: "IfNotPresent"
--- a/kubernetes-node-problem-detector/values.yaml
+++ b/kubernetes-node-problem-detector/values.yaml
@@ -17,7 +17,7 @@
 ---
 images:
  tags:
-    node_problem_detector: docker.io/openstackhelm/node-problem-detector:latest-ubuntu_jammy
+    node_problem_detector: quay.io/airshipit/node-problem-detector:latest-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: IfNotPresent
--- a/libvirt/values.yaml
+++ b/libvirt/values.yaml
@@ -26,7 +26,7 @@ labels:

 images:
  tags:
-    libvirt: docker.io/openstackhelm/libvirt:2025.1-ubuntu_noble
+    libvirt: quay.io/airshipit/libvirt:2025.1-ubuntu_noble
    libvirt_exporter: vexxhost/libvirtd-exporter:latest
    ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -33,14 +33,14 @@ images:
  tags:
    bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    magnum_db_sync: docker.io/openstackhelm/magnum:2025.1-ubuntu_noble
+    magnum_db_sync: quay.io/airshipit/magnum:2025.1-ubuntu_noble
    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    magnum_api: docker.io/openstackhelm/magnum:2025.1-ubuntu_noble
-    magnum_conductor: docker.io/openstackhelm/magnum:2025.1-ubuntu_noble
+    magnum_api: quay.io/airshipit/magnum:2025.1-ubuntu_noble
+    magnum_conductor: quay.io/airshipit/magnum:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: docker.io/docker:17.07.0
  pull_policy: "IfNotPresent"
--- a/mariadb-backup/values.yaml
+++ b/mariadb-backup/values.yaml
@@ -20,7 +20,7 @@ release_group: null

 images:
  tags:
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
+    mariadb: quay.io/airshipit/mariadb:latest-ubuntu_noble
    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
--- a/masakari/values.yaml
+++ b/masakari/values.yaml
@@ -14,17 +14,17 @@
 images:
  tags:
    db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    db_sync: docker.io/openstackhelm/masakari:2025.1-ubuntu_noble
+    db_sync: quay.io/airshipit/masakari:2025.1-ubuntu_noble
    db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    ks_endpoints: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    ks_service: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    masakari_api: docker.io/openstackhelm/masakari:2025.1-ubuntu_noble
-    masakari_engine: docker.io/openstackhelm/masakari:2025.1-ubuntu_noble
-    masakari_host_monitor: docker.io/openstackhelm/masakari-monitors:2025.1-ubuntu_noble
-    masakari_process_monitor: docker.io/openstackhelm/masakari-monitors:2025.1-ubuntu_noble
-    masakari_instance_monitor: docker.io/openstackhelm/masakari-monitors:2025.1-ubuntu_noble
-    masakari_introspective_instance_monitor: docker.io/openstackhelm/masakari-monitors:2025.1-ubuntu_noble
+    masakari_api: quay.io/airshipit/masakari:2025.1-ubuntu_noble
+    masakari_engine: quay.io/airshipit/masakari:2025.1-ubuntu_noble
+    masakari_host_monitor: quay.io/airshipit/masakari-monitors:2025.1-ubuntu_noble
+    masakari_process_monitor: quay.io/airshipit/masakari-monitors:2025.1-ubuntu_noble
+    masakari_instance_monitor: quay.io/airshipit/masakari-monitors:2025.1-ubuntu_noble
+    masakari_introspective_instance_monitor: quay.io/airshipit/masakari-monitors:2025.1-ubuntu_noble
    rabbit_init: docker.io/rabbitmq:3.13-management
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
  pull_policy: "IfNotPresent"
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -18,9 +18,9 @@
 images:
  tags:
    apache_proxy: docker.io/library/httpd:2.4
-    nagios: docker.io/openstackhelm/nagios:latest-ubuntu_jammy
+    nagios: quay.io/airshipit/nagios:latest-ubuntu_jammy
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_jammy
+    selenium_tests: quay.io/airshipit/osh-selenium:latest-ubuntu_noble
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: IfNotPresent
  local_registry:
--- a/octavia/values.yaml
+++ b/octavia/values.yaml
@@ -64,7 +64,7 @@ images:
    octavia_housekeeping: quay.io/airshipit/octavia:2025.1-ubuntu_jammy
    octavia_health_manager: quay.io/airshipit/octavia:2025.1-ubuntu_jammy
    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_jammy
  pull_policy: "IfNotPresent"
  local_registry:
    active: false
--- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml
@@ -20,8 +20,8 @@ release_group: null

 images:
  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal
+    openvswitch_db_server: quay.io/airshipit/openvswitch:latest-ubuntu_focal
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_focal
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
  pull_policy: "IfNotPresent"
--- a/ovn/values.yaml
+++ b/ovn/values.yaml
@@ -20,10 +20,10 @@ release_group: null

 images:
  tags:
-    ovn_ovsdb_nb: docker.io/openstackhelm/ovn:ubuntu_noble
-    ovn_ovsdb_sb: docker.io/openstackhelm/ovn:ubuntu_noble
-    ovn_northd: docker.io/openstackhelm/ovn:ubuntu_noble
-    ovn_controller: docker.io/openstackhelm/ovn:ubuntu_noble
+    ovn_ovsdb_nb: quay.io/airshipit/ovn:ubuntu_noble
+    ovn_ovsdb_sb: quay.io/airshipit/ovn:ubuntu_noble
+    ovn_northd: quay.io/airshipit/ovn:ubuntu_noble
+    ovn_controller: quay.io/airshipit/ovn:ubuntu_noble
    ovn_controller_kubectl: quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
--- a/prometheus-openstack-exporter/values.yaml
+++ b/prometheus-openstack-exporter/values.yaml
@@ -17,7 +17,7 @@
 ---
 images:
  tags:
-    prometheus_openstack_exporter: docker.io/openstackhelm/prometheus-openstack-exporter:latest-ubuntu_jammy
+    prometheus_openstack_exporter: quay.io/airshipit/prometheus-openstack-exporter:latest-ubuntu_jammy
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
    image_repo_sync: quay.io/airshipit/docker:27.5.0
    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
--- a/tempest/values.yaml
+++ b/tempest/values.yaml
@@ -24,7 +24,7 @@ labels:
 images:
  tags:
    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    tempest_run_tests: docker.io/openstackhelm/tempest:latest-ubuntu_focal
+    tempest_run_tests: quay.io/airshipit/tempest:latest-ubuntu_noble
    ks_user: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
    image_repo_sync: docker.io/docker:17.07.0
  pull_policy: "IfNotPresent"
--- a/values_overrides/barbican/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/barbican/2024.1-ubuntu_jammy.yaml
@@ -1,13 +0,0 @@
---
-images:
-  tags:
-    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    scripted_test: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    barbican_db_sync: "quay.io/airshipit/barbican:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    barbican_api: "quay.io/airshipit/barbican:2024.1-ubuntu_jammy"
-...
--- a/values_overrides/ceph-rgw/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/ceph-rgw/2024.1-ubuntu_jammy.yaml
@@ -1,19 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    ks_endpoints: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
-    ks_service: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
-    ks_user: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
-...
--- a/values_overrides/ceph-rgw/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/ceph-rgw/2024.2-ubuntu_jammy.yaml
@@ -13,7 +13,7 @@
 ---
 images:
  tags:
-    ks_endpoints: 'docker.io/openstackhelm/heat:2024.2-ubuntu_jammy'
-    ks_service: 'docker.io/openstackhelm/heat:2024.2-ubuntu_jammy'
-    ks_user: 'docker.io/openstackhelm/heat:2024.2-ubuntu_jammy'
+    ks_endpoints: 'quay.io/airshipit/heat:2024.2-ubuntu_jammy'
+    ks_service: 'quay.io/airshipit/heat:2024.2-ubuntu_jammy'
+    ks_user: 'quay.io/airshipit/heat:2024.2-ubuntu_jammy'
 ...
--- a/values_overrides/cinder/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/cinder/2024.1-ubuntu_jammy.yaml
@@ -1,19 +0,0 @@
---
-images:
-  tags:
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    cinder_db_sync: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    cinder_api: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    cinder_scheduler: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    cinder_volume: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    cinder_db_purge: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
-    cinder_backup: "quay.io/airshipit/cinder:2024.1-ubuntu_jammy"
-    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
-...
--- a/values_overrides/cinder/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/cinder/2024.2-ubuntu_jammy.yaml
@@ -13,7 +13,7 @@ images:
    cinder_volume: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
    cinder_db_purge: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
    cinder_backup: "quay.io/airshipit/cinder:2024.2-ubuntu_jammy"
-    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/cinder/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/cinder/2025.1-ubuntu_jammy.yaml
@@ -13,7 +13,7 @@ images:
    cinder_volume: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
    cinder_db_purge: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
    cinder_backup: "quay.io/airshipit/cinder:2025.1-ubuntu_jammy"
-    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/cinder/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cinder/2025.1-ubuntu_noble.yaml
@@ -13,7 +13,7 @@ images:
    cinder_volume: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
    cinder_db_purge: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
    cinder_backup: "quay.io/airshipit/cinder:2025.1-ubuntu_noble"
-    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/cinder/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cinder/2025.2-ubuntu_noble.yaml
@@ -13,7 +13,7 @@ images:
    cinder_volume: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
    cinder_volume_usage_audit: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
    cinder_db_purge: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
    cinder_backup: "quay.io/airshipit/cinder:2025.2-ubuntu_noble"
-    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/cinder/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/cinder/uv-2025.1-ubuntu_noble.yaml
@@ -13,7 +13,7 @@ images:
    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"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    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_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/cinder/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/cinder/uv-2025.2-ubuntu_noble.yaml
@@ -13,7 +13,7 @@ images:
    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"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    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_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/elasticsearch/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/elasticsearch/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    memory_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/elasticsearch/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/elasticsearch/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    memory_init: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    memory_init: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/elasticsearch/remote-cluster.yaml
+++ b/values_overrides/elasticsearch/remote-cluster.yaml
@@ -26,7 +26,4 @@ pod:
    data: 1
    client: 1
    gateway: 1
-images:
-  tags:
-    elasticsearch: docker.io/openstackhelm/elasticsearch-s3:7_6_2-centos_7
 ...
--- a/values_overrides/fluentd/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/fluentd/2024.1-ubuntu_jammy.yaml
@@ -1,17 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/fluentd/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/fluentd/2024.2-ubuntu_jammy.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/glance/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/glance/2024.1-ubuntu_jammy.yaml
@@ -1,14 +0,0 @@
---
-images:
-  tags:
-    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    glance_db_sync: "quay.io/airshipit/glance:2024.1-ubuntu_jammy"
-    glance_api: "quay.io/airshipit/glance:2024.1-ubuntu_jammy"
-    glance_metadefs_load: "quay.io/airshipit/glance:2024.1-ubuntu_jammy"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
-...
--- a/values_overrides/glance/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/glance/2024.2-ubuntu_jammy.yaml
@@ -10,5 +10,5 @@ images:
    glance_db_sync: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
    glance_api: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
    glance_metadefs_load: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/glance/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/glance/2025.1-ubuntu_jammy.yaml
@@ -10,5 +10,5 @@ images:
    glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
    glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/glance/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/glance/2025.1-ubuntu_noble.yaml
@@ -10,5 +10,5 @@ images:
    glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_noble"
    glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_noble"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_noble"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/glance/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/glance/2025.2-ubuntu_noble.yaml
@@ -10,5 +10,5 @@ images:
    glance_db_sync: "quay.io/airshipit/glance:2025.2-ubuntu_noble"
    glance_api: "quay.io/airshipit/glance:2025.2-ubuntu_noble"
    glance_metadefs_load: "quay.io/airshipit/glance:2025.2-ubuntu_noble"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/glance/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/glance/uv-2025.1-ubuntu_noble.yaml
@@ -10,5 +10,5 @@ images:
    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"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/glance/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/glance/uv-2025.2-ubuntu_noble.yaml
@@ -10,5 +10,5 @@ images:
    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"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    glance_storage_init: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/grafana/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/grafana/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    db_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    grafana_db_session_sync: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/grafana/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/grafana/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    db_init: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    grafana_db_session_sync: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    db_init: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    grafana_db_session_sync: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/heat/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/heat/2024.1-ubuntu_jammy.yaml
@@ -1,16 +0,0 @@
---
-images:
-  tags:
-    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    heat_db_sync: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    heat_api: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    heat_cfn: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    heat_engine: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    heat_engine_cleaner: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-    heat_purge_deleted: "quay.io/airshipit/heat:2024.1-ubuntu_jammy"
-...
--- a/values_overrides/horizon/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/horizon/2024.1-ubuntu_jammy.yaml
@@ -1,8 +0,0 @@
---
-images:
-  tags:
-    db_init: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    horizon_db_sync: quay.io/airshipit/horizon:2024.1-ubuntu_jammy
-    horizon: quay.io/airshipit/horizon:2024.1-ubuntu_jammy
-...
--- a/values_overrides/keystone/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/keystone/2024.1-ubuntu_jammy.yaml
@@ -1,16 +0,0 @@
---
-images:
-  tags:
-    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    keystone_api: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    keystone_bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    keystone_credential_rotate: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    keystone_credential_setup: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    keystone_db_sync: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    keystone_domain_manage: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    keystone_fernet_rotate: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    keystone_fernet_setup: "quay.io/airshipit/keystone:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-...
--- a/values_overrides/kibana/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/kibana/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    register_kibana_indexes: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    flush_kibana_metadata: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/kibana/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/kibana/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    register_kibana_indexes: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    flush_kibana_metadata: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    register_kibana_indexes: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    flush_kibana_metadata: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/kubernetes-keystone-webhook/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/2024.1-ubuntu_jammy.yaml
@@ -1,17 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    scripted_test: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/kubernetes-keystone-webhook/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/kubernetes-keystone-webhook/2024.2-ubuntu_jammy.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    scripted_test: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    scripted_test: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/libvirt/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/libvirt/2024.1-ubuntu_jammy.yaml
@@ -1,5 +0,0 @@
---
-images:
-  tags:
-    libvirt: docker.io/openstackhelm/libvirt:2024.1-ubuntu_jammy
-...
--- a/values_overrides/libvirt/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/libvirt/2024.2-ubuntu_jammy.yaml
@@ -1,5 +1,5 @@
 ---
 images:
  tags:
-    libvirt: docker.io/openstackhelm/libvirt:2024.1-ubuntu_jammy
+    libvirt: quay.io/airshipit/libvirt:2024.2-ubuntu_noble
 ...
--- a/values_overrides/libvirt/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/libvirt/2025.1-ubuntu_jammy.yaml
@@ -1,5 +1,5 @@
 ---
 images:
  tags:
-    libvirt: docker.io/openstackhelm/libvirt:2025.1-ubuntu_noble
+    libvirt: quay.io/airshipit/libvirt:2025.1-ubuntu_noble
 ...
--- a/values_overrides/libvirt/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/libvirt/2025.1-ubuntu_noble.yaml
@@ -1,5 +1,5 @@
 ---
 images:
  tags:
-    libvirt: docker.io/openstackhelm/libvirt:2025.1-ubuntu_noble
+    libvirt: quay.io/airshipit/libvirt:2025.1-ubuntu_noble
 ...
--- a/values_overrides/libvirt/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/libvirt/2025.2-ubuntu_noble.yaml
@@ -1,5 +1,5 @@
 ---
 images:
  tags:
-    libvirt: docker.io/openstackhelm/libvirt:2025.2-ubuntu_noble
+    libvirt: quay.io/airshipit/libvirt:2025.2-ubuntu_noble
 ...
--- a/values_overrides/manila/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/manila/2024.1-ubuntu_jammy.yaml
@@ -1,21 +0,0 @@
---
-images:
-  tags:
-    bootstrap: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    db_init: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    manila_db_sync: quay.io/airshipit/manila:2024.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    ks_user: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    manila_api: quay.io/airshipit/manila:2024.1-ubuntu_jammy
-    manila_data: quay.io/airshipit/manila:2024.1-ubuntu_jammy
-    manila_scheduler: quay.io/airshipit/manila:2024.1-ubuntu_jammy
-    manila_share: quay.io/airshipit/manila:2024.1-ubuntu_jammy
-conf:
-  manila_api_uwsgi:
-    uwsgi:
-      # in 2025.2 the wsgi script was removed
-      wsgi-file: /var/lib/openstack/bin/manila-wsgi
-...
--- a/values_overrides/mariadb-backup/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/mariadb-backup/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/mariadb-backup/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/mariadb-backup/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    ks_user: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/mariadb-backup/ubuntu_focal.yaml
+++ b/values_overrides/mariadb-backup/ubuntu_focal.yaml
@@ -1,19 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-    ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
-    mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
-...
--- a/values_overrides/mariadb-cluster/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/mariadb-cluster/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/mariadb-cluster/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/mariadb-cluster/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    ks_user: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/mariadb-cluster/ubuntu_focal.yaml
+++ b/values_overrides/mariadb-cluster/ubuntu_focal.yaml
@@ -1,20 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-    ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
-    scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
-    mariadb_cluster_refresh_statefulset: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
-...
--- a/values_overrides/mariadb/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/mariadb/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/mariadb/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/mariadb/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    ks_user: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/mariadb/ubuntu_focal.yaml
+++ b/values_overrides/mariadb/ubuntu_focal.yaml
@@ -1,20 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-    prometheus_create_mysql_user: docker.io/library/mariadb:10.5.9-focal
-    mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
-    scripted_test: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-...
--- a/values_overrides/neutron/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/neutron/2024.1-ubuntu_jammy.yaml
@@ -1,22 +0,0 @@
---
-images:
-  tags:
-    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    neutron_db_sync: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_dhcp: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_l3: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_l2gw: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_metadata: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_ovn_metadata: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_openvswitch_agent: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_server: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_rpc_server: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_bagpipe_bgp: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-    neutron_netns_cleanup_cron: "quay.io/airshipit/neutron:2024.1-ubuntu_jammy"
-...
--- a/values_overrides/nova/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/nova/2024.1-ubuntu_jammy.yaml
@@ -1,23 +0,0 @@
---
-images:
-  tags:
-    bootstrap: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    nova_api: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_cell_setup: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_cell_setup_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    nova_compute: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_compute_ssh: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_conductor: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_db_sync: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_novncproxy: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_novncproxy_assets: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_scheduler: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_spiceproxy: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_spiceproxy_assets: "quay.io/airshipit/nova:2024.1-ubuntu_jammy"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
-...
--- a/values_overrides/nova/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/nova/2024.2-ubuntu_jammy.yaml
@@ -19,5 +19,5 @@ images:
    nova_scheduler: "quay.io/airshipit/nova:2024.2-ubuntu_jammy"
    nova_spiceproxy: "quay.io/airshipit/nova:2024.2-ubuntu_jammy"
    nova_spiceproxy_assets: "quay.io/airshipit/nova:2024.2-ubuntu_jammy"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/nova/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/nova/2025.1-ubuntu_jammy.yaml
@@ -19,5 +19,5 @@ images:
    nova_scheduler: "quay.io/airshipit/nova:2025.1-ubuntu_jammy"
    nova_spiceproxy: "quay.io/airshipit/nova:2025.1-ubuntu_jammy"
    nova_spiceproxy_assets: "quay.io/airshipit/nova:2025.1-ubuntu_jammy"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/nova/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/nova/2025.1-ubuntu_noble.yaml
@@ -19,5 +19,5 @@ images:
    nova_scheduler: "quay.io/airshipit/nova:2025.1-ubuntu_noble"
    nova_spiceproxy: "quay.io/airshipit/nova:2025.1-ubuntu_noble"
    nova_spiceproxy_assets: "quay.io/airshipit/nova:2025.1-ubuntu_noble"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/nova/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/nova/2025.2-ubuntu_noble.yaml
@@ -19,5 +19,5 @@ images:
    nova_scheduler: "quay.io/airshipit/nova:2025.2-ubuntu_noble"
    nova_spiceproxy: "quay.io/airshipit/nova:2025.2-ubuntu_noble"
    nova_spiceproxy_assets: "quay.io/airshipit/nova:2025.2-ubuntu_noble"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/nova/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/nova/uv-2025.1-ubuntu_noble.yaml
@@ -19,5 +19,5 @@ images:
    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"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/nova/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/nova/uv-2025.2-ubuntu_noble.yaml
@@ -19,5 +19,5 @@ images:
    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"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    nova_service_cleaner: "quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy"
 ...
--- a/values_overrides/octavia/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/octavia/2024.1-ubuntu_jammy.yaml
@@ -1,27 +0,0 @@
---
-images:
-  tags:
-    test: docker.io/xrally/xrally-openstack:2.0.0
-    bootstrap: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    db_init: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    octavia_db_sync: quay.io/airshipit/octavia:2024.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    rabbit_init: docker.io/rabbitmq:3.13-management
-    ks_user: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
-    image_repo_sync: docker.io/docker:17.07.0
-    octavia_api: quay.io/airshipit/octavia:2024.1-ubuntu_jammy
-    octavia_driver_agent: quay.io/airshipit/octavia:2024.1-ubuntu_jammy
-    octavia_worker: quay.io/airshipit/octavia:2024.1-ubuntu_jammy
-    octavia_worker_init: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    octavia_housekeeping: quay.io/airshipit/octavia:2024.1-ubuntu_jammy
-    octavia_health_manager: quay.io/airshipit/octavia:2024.1-ubuntu_jammy
-    octavia_health_manager_init: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy
-conf:
-  octavia_api_uwsgi:
-    uwsgi:
-      wsgi-file: /var/lib/openstack/bin/octavia-wsgi
-...
--- a/values_overrides/octavia/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/octavia/2024.2-ubuntu_jammy.yaml
@@ -19,7 +19,7 @@ images:
    octavia_housekeeping: quay.io/airshipit/octavia:2024.2-ubuntu_jammy
    octavia_health_manager: quay.io/airshipit/octavia:2024.2-ubuntu_jammy
    octavia_health_manager_init: quay.io/airshipit/openstack-client:2024.2-ubuntu_jammy
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_jammy
 conf:
  octavia_api_uwsgi:
    uwsgi:
--- a/values_overrides/octavia/2025.1-ubuntu_jammy.yaml
+++ b/values_overrides/octavia/2025.1-ubuntu_jammy.yaml
@@ -19,7 +19,7 @@ images:
    octavia_housekeeping: quay.io/airshipit/octavia:2025.1-ubuntu_jammy
    octavia_health_manager: quay.io/airshipit/octavia:2025.1-ubuntu_jammy
    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_jammy
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_jammy
 conf:
  octavia_api_uwsgi:
    uwsgi:
--- a/values_overrides/octavia/2025.1-ubuntu_noble.yaml
+++ b/values_overrides/octavia/2025.1-ubuntu_noble.yaml
@@ -19,7 +19,7 @@ images:
    octavia_housekeeping: quay.io/airshipit/octavia:2025.1-ubuntu_noble
    octavia_health_manager: quay.io/airshipit/octavia:2025.1-ubuntu_noble
    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble
 conf:
  octavia_api_uwsgi:
    uwsgi:
--- a/values_overrides/octavia/2025.2-ubuntu_noble.yaml
+++ b/values_overrides/octavia/2025.2-ubuntu_noble.yaml
@@ -19,7 +19,7 @@ images:
    octavia_housekeeping: quay.io/airshipit/octavia:2025.2-ubuntu_noble
    octavia_health_manager: quay.io/airshipit/octavia:2025.2-ubuntu_noble
    octavia_health_manager_init: quay.io/airshipit/openstack-client:2025.2-ubuntu_noble
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble
 conf:
  octavia_api_uwsgi:
    uwsgi:
--- a/values_overrides/octavia/uv-2025.1-ubuntu_noble.yaml
+++ b/values_overrides/octavia/uv-2025.1-ubuntu_noble.yaml
@@ -19,7 +19,7 @@ images:
    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
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble
 conf:
  octavia_api_uwsgi:
    uwsgi:
--- a/values_overrides/octavia/uv-2025.2-ubuntu_noble.yaml
+++ b/values_overrides/octavia/uv-2025.2-ubuntu_noble.yaml
@@ -19,7 +19,7 @@ images:
    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
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble
 conf:
  octavia_api_uwsgi:
    uwsgi:
--- a/values_overrides/openvswitch/dpdk-ubuntu_focal.yaml
+++ b/values_overrides/openvswitch/dpdk-ubuntu_focal.yaml
@@ -1,24 +0,0 @@
---
-images:
-  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal-dpdk
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal-dpdk
-pod:
-  resources:
-    enabled: true
-    ovs:
-      vswitchd:
-        requests:
-          memory: "2Gi"
-          cpu: "2"
-        limits:
-          memory: "2Gi"
-          cpu: "2"
-          hugepages-2Mi: "1Gi"
-conf:
-  ovs_dpdk:
-    enabled: true
-    hugepages_mountpath: /dev/hugepages
-    vhostuser_socket_dir: vhostuser
-    socket_memory: 512
-...
--- a/values_overrides/openvswitch/dpdk-ubuntu_jammy.yaml
+++ b/values_overrides/openvswitch/dpdk-ubuntu_jammy.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy-dpdk
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy-dpdk
+    openvswitch_db_server: quay.io/airshipit/openvswitch:latest-ubuntu_jammy-dpdk
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_jammy-dpdk
 pod:
  resources:
    enabled: true
--- a/values_overrides/openvswitch/dpdk-ubuntu_noble.yaml
+++ b/values_overrides/openvswitch/dpdk-ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble-dpdk
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble-dpdk
+    openvswitch_db_server: quay.io/airshipit/openvswitch:latest-ubuntu_noble-dpdk
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble-dpdk
 pod:
  resources:
    enabled: true
--- a/values_overrides/openvswitch/ubuntu_focal.yaml
+++ b/values_overrides/openvswitch/ubuntu_focal.yaml
@@ -1,6 +0,0 @@
---
-images:
-  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal
-...
--- a/values_overrides/openvswitch/ubuntu_jammy.yaml
+++ b/values_overrides/openvswitch/ubuntu_jammy.yaml
@@ -1,6 +1,6 @@
 ---
 images:
  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy
+    openvswitch_db_server: quay.io/airshipit/openvswitch:latest-ubuntu_jammy
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_jammy
 ...
--- a/values_overrides/openvswitch/ubuntu_noble.yaml
+++ b/values_overrides/openvswitch/ubuntu_noble.yaml
@@ -1,6 +1,6 @@
 ---
 images:
  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_noble
+    openvswitch_db_server: quay.io/airshipit/openvswitch:latest-ubuntu_noble
+    openvswitch_vswitchd: quay.io/airshipit/openvswitch:latest-ubuntu_noble
 ...
--- a/values_overrides/ovn/ubuntu_focal.yaml
+++ b/values_overrides/ovn/ubuntu_focal.yaml
@@ -1,8 +0,0 @@
---
-images:
-  tags:
-    ovn_ovsdb_nb: docker.io/openstackhelm/ovn:ubuntu_focal
-    ovn_ovsdb_sb: docker.io/openstackhelm/ovn:ubuntu_focal
-    ovn_northd: docker.io/openstackhelm/ovn:ubuntu_focal
-    ovn_controller: docker.io/openstackhelm/ovn:ubuntu_focal
-...
--- a/values_overrides/ovn/ubuntu_jammy.yaml
+++ b/values_overrides/ovn/ubuntu_jammy.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    ovn_ovsdb_nb: docker.io/openstackhelm/ovn:ubuntu_jammy
-    ovn_ovsdb_sb: docker.io/openstackhelm/ovn:ubuntu_jammy
-    ovn_northd: docker.io/openstackhelm/ovn:ubuntu_jammy
-    ovn_controller: docker.io/openstackhelm/ovn:ubuntu_jammy
+    ovn_ovsdb_nb: quay.io/airshipit/ovn:ubuntu_jammy
+    ovn_ovsdb_sb: quay.io/airshipit/ovn:ubuntu_jammy
+    ovn_northd: quay.io/airshipit/ovn:ubuntu_jammy
+    ovn_controller: quay.io/airshipit/ovn:ubuntu_jammy
 ...
--- a/values_overrides/ovn/ubuntu_noble.yaml
+++ b/values_overrides/ovn/ubuntu_noble.yaml
@@ -1,8 +1,8 @@
 ---
 images:
  tags:
-    ovn_ovsdb_nb: docker.io/openstackhelm/ovn:ubuntu_noble
-    ovn_ovsdb_sb: docker.io/openstackhelm/ovn:ubuntu_noble
-    ovn_northd: docker.io/openstackhelm/ovn:ubuntu_noble
-    ovn_controller: docker.io/openstackhelm/ovn:ubuntu_noble
+    ovn_ovsdb_nb: quay.io/airshipit/ovn:ubuntu_noble
+    ovn_ovsdb_sb: quay.io/airshipit/ovn:ubuntu_noble
+    ovn_northd: quay.io/airshipit/ovn:ubuntu_noble
+    ovn_controller: quay.io/airshipit/ovn:ubuntu_noble
 ...
--- a/values_overrides/placement/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/placement/2024.1-ubuntu_jammy.yaml
@@ -1,19 +0,0 @@
---
-images:
-  pull_policy: IfNotPresent
-  tags:
-    placement: "quay.io/airshipit/placement:2024.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy"
-    placement_db_sync: "quay.io/airshipit/placement:2024.1-ubuntu_jammy"
-    dep_check: "quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy"
-    image_repo_sync: "docker.io/docker:17.07.0"
-dependencies:
-  static:
-    db_sync:
-      jobs:
-        - placement-db-init
-...
--- a/values_overrides/postgresql/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/postgresql/2024.1-ubuntu_jammy.yaml
@@ -1,17 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/postgresql/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/postgresql/2024.2-ubuntu_jammy.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    ks_user: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    ks_user: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/powerdns/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/powerdns/2024.1-ubuntu_jammy.yaml
@@ -1,17 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    db_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/powerdns/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/powerdns/2024.2-ubuntu_jammy.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    db_init: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    db_init: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/prometheus-mysql-exporter/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/prometheus-mysql-exporter/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/prometheus-mysql-exporter/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/prometheus-mysql-exporter/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    prometheus_mysql_exporter_helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    ks_user: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/prometheus/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/prometheus/2024.1-ubuntu_jammy.yaml
@@ -1,17 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/prometheus/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/prometheus/2024.2-ubuntu_jammy.yaml
@@ -13,5 +13,5 @@
 ---
 images:
  tags:
-    helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/rabbitmq/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/rabbitmq/2024.1-ubuntu_jammy.yaml
@@ -1,18 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-images:
-  tags:
-    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    rabbitmq_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-...
--- a/values_overrides/rabbitmq/2024.2-ubuntu_jammy.yaml
+++ b/values_overrides/rabbitmq/2024.2-ubuntu_jammy.yaml
@@ -13,6 +13,6 @@
 ---
 images:
  tags:
-    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
-    rabbitmq_init: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
+    prometheus_rabbitmq_exporter_helm_tests: quay.io/airshipit/heat:2024.2-ubuntu_jammy
+    rabbitmq_init: quay.io/airshipit/heat:2024.2-ubuntu_jammy
 ...
--- a/values_overrides/tacker/2024.1-ubuntu_jammy.yaml
+++ b/values_overrides/tacker/2024.1-ubuntu_jammy.yaml
@@ -1,16 +0,0 @@
-# Default values for tacker.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
---
-images:
-  tags:
-    tacker_server: quay.io/airshipit/tacker:2024.1-ubuntu_jammy
-    tacker_conductor: quay.io/airshipit/tacker:2024.1-ubuntu_jammy
-    db_init: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    db_drop: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    tacker_db_sync: quay.io/airshipit/tacker:2024.1-ubuntu_jammy
-    ks_endpoints: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    ks_service: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-    ks_user: quay.io/airshipit/openstack-client:2024.1-ubuntu_jammy
-...