diff --git a/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml b/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml
index 64639aba..52e26172 100644
--- a/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml
+++ b/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml
@@ -37,21 +37,19 @@ release_group: null
 images:
   tags:
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
+    gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal
     db_init_indexer: docker.io/library/postgres:14.5
-    # using non-kolla images until kolla supports postgres as
-    # an indexer
-    db_init: quay.io/openstack.kolla/ubuntu-source-gnocchi-api:yoga
-    db_sync: quay.io/openstack.kolla/ubuntu-source-gnocchi-api:yoga
-    ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
-    ks_service: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
-    ks_endpoints: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    db_init: ghcr.io/lukerepko/genestack/gnocchi:4.6.2
+    db_sync: ghcr.io/lukerepko/genestack/gnocchi:4.6.2
+    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+    ks_service: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+    ks_endpoints: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
     gnocchi_api: ghcr.io/lukerepko/genestack/gnocchi:4.6.2
-    gnocchi_statsd: quay.io/openstack.kolla/ubuntu-source-gnocchi-statsd:yoga
-    gnocchi_metricd: quay.io/openstack.kolla/ubuntu-source-gnocchi-metricd:yoga
-    gnocchi_resources_cleaner: quay.io/openstack.kolla/ubuntu-source-gnocchi-base:yoga
+    gnocchi_statsd: ghcr.io/lukerepko/genestack/gnocchi:4.6.2
+    gnocchi_metricd: ghcr.io/lukerepko/genestack/gnocchi:4.6.2
+    gnocchi_resources_cleaner: ghcr.io/lukerepko/genestack/gnocchi:4.6.2
     image_repo_sync: docker.io/library/docker:17.07.0
-  pull_policy: "IfNotPresent"
+  pull_policy: "Always"
   local_registry:
     active: false
     exclude: