diff --git a/hack/sync-charts.sh b/hack/sync-charts.sh
index da82dd4..6a59616 100755
--- a/hack/sync-charts.sh
+++ b/hack/sync-charts.sh
@@ -23,82 +23,19 @@
 # Determine the root path for Atmosphere
 ATMOSPHERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )"
 
-mv ${ATMOSPHERE}/charts/staffeln ${ATMOSPHERE}/tmp_staffeln
-# Clean-up all of the existing charts
-rm -rfv ${ATMOSPHERE}/charts/*
-mv ${ATMOSPHERE}/tmp_staffeln ${ATMOSPHERE}/charts/staffeln
+# Sync using "vendir"
+vendir sync
 
-CEPH_CSI_RBD_VERSION=3.5.1
-curl -sL https://ceph.github.io/csi-charts/rbd/ceph-csi-rbd-${CEPH_CSI_RBD_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-NODE_FEATURE_DISCOVERY_VERSION=0.11.2
-curl -sL https://github.com/kubernetes-sigs/node-feature-discovery/releases/download/v${NODE_FEATURE_DISCOVERY_VERSION}/node-feature-discovery-chart-${NODE_FEATURE_DISCOVERY_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-KUBE_PROMETHEUS_STACK_VERSION=49.0.0
-curl -sL https://github.com/prometheus-community/helm-charts/releases/download/kube-prometheus-stack-${KUBE_PROMETHEUS_STACK_VERSION}/kube-prometheus-stack-${KUBE_PROMETHEUS_STACK_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-LOKI_VERSION=4.6.1
-curl -sL https://github.com/grafana/helm-charts/releases/download/helm-loki-${LOKI_VERSION}/loki-${LOKI_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-VECTOR_VERSION=0.19.0
-curl -sL https://github.com/vectordotdev/helm-charts/releases/download/vector-${VECTOR_VERSION}/vector-${VECTOR_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-PROMETHEUS_PUSHGATEWAY_VERSION=1.16.0
-curl -sL https://github.com/prometheus-community/helm-charts/releases/download/prometheus-pushgateway-${PROMETHEUS_PUSHGATEWAY_VERSION}/prometheus-pushgateway-${PROMETHEUS_PUSHGATEWAY_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-INGRESS_NGINX_VERSION=4.0.17
-curl -sL https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-${INGRESS_NGINX_VERSION}/ingress-nginx-${INGRESS_NGINX_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-CERT_MANAGER_WEBHOOK_INFOBLOX_WAPI_VERSION=1.5.2
-curl -sL https://github.com/luisico/cert-manager-webhook-infoblox-wapi/releases/download/helm-chart-${CERT_MANAGER_WEBHOOK_INFOBLOX_WAPI_VERSION}/cert-manager-webhook-infoblox-wapi-${CERT_MANAGER_WEBHOOK_INFOBLOX_WAPI_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-RABBITMQ_CLUSTER_OPERATOR_VERSION=2.6.6
-curl -sL https://charts.bitnami.com/bitnami/rabbitmq-cluster-operator-${RABBITMQ_CLUSTER_OPERATOR_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-PXC_OPERATOR_VERSION=1.12.0
-curl -sL https://github.com/Percona-Lab/percona-helm-charts/releases/download/pxc-operator-${PXC_OPERATOR_VERSION}/pxc-operator-${PXC_OPERATOR_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-COREDNS_VERSION=1.19.4
-curl -sL https://github.com/coredns/helm/releases/download/coredns-${COREDNS_VERSION}/coredns-${COREDNS_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-MEMCACHED_VERSION=0.1.12
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm-infra/memcached-${MEMCACHED_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-KEYSTONE_VERSION=0.3.5
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/keystone-${KEYSTONE_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Keystone
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899867/revisions/1/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
   | filterdiff -p2 -x 'Chart.yaml' \
   | filterdiff -p1 -i 'keystone/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/keystone
-# Remove extra files before 899867 merged
-rm -fv ${ATMOSPHERE}/charts/keystone/templates/bin/_domain-manage-init.sh.tpl ${ATMOSPHERE}/charts/keystone/templates/bin/_domain-manage.py.tpl
+rm -fv ${ATMOSPHERE}/charts/keystone/templates/bin/{_domain-manage-init.sh.tpl,_domain-manage.py.tpl}
 
-BARBICAN_VERSION=0.3.6
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/barbican-${BARBICAN_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-CEPH_PROVISIONERS_VERSION=0.1.8
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm-infra/ceph-provisioners-${CEPH_PROVISIONERS_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-GLANCE_VERSION=0.4.15
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/glance-${GLANCE_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Glance
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899864/revisions/2/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -106,9 +43,7 @@
   | filterdiff -p1 -i 'glance/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/glance
 
-CINDER_VERSION=0.3.15
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/cinder-${CINDER_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Cinder
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899814/revisions/1/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -116,25 +51,15 @@
   | filterdiff -p1 -i 'cinder/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/cinder
 
-PLACEMENT_VERSION=0.3.9
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/placement-${PLACEMENT_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Placement
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899914/revisions/3/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
   | filterdiff -p2 -x 'Chart.yaml' \
   | filterdiff -p1 -i 'placement/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/placement
-# Remove extra files before 899914 merged
-rm -rfv ${ATMOSPHERE}/charts/placement/values_overrides/
 
-OPEN_VSWITCH_VERSION=0.1.19
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm-infra/openvswitch-${OPEN_VSWITCH_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-LIBVIRT_VERSION=0.1.27
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm-infra/libvirt-${LIBVIRT_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Libvirt
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm-infra~893406/revisions/9/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -142,13 +67,7 @@
   | filterdiff -p1 -i 'libvirt/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/libvirt
 
-LOCAL_PATH_PROVISIONER_VERSION=0.0.24
-curl -sL https://github.com/rancher/local-path-provisioner/archive/refs/tags/v${LOCAL_PATH_PROVISIONER_VERSION}.tar.gz \
-  | tar -xz -C ${ATMOSPHERE}/charts --strip-components=3 local-path-provisioner-${LOCAL_PATH_PROVISIONER_VERSION}/deploy/chart/
-
-OVN_VERSION=0.1.4
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm-infra/ovn-${OVN_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# OVN
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm-infra~893739/revisions/2/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -156,37 +75,7 @@
   | filterdiff -p1 -i 'ovn/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/ovn
 
-NEUTRON_VERSION=0.3.24
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/neutron-${NEUTRON_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899711/revisions/2/patch?download' \
-  | base64 --decode \
-  | filterdiff -p1 -x 'releasenotes/*' \
-  | filterdiff -p2 -x 'Chart.yaml' \
-  | filterdiff -p1 -i 'neutron/*' \
-  | patch -p2 -d ${ATMOSPHERE}/charts/neutron
-curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899684/revisions/4/patch?download' \
-  | base64 --decode \
-  | filterdiff -p1 -x 'releasenotes/*' \
-  | filterdiff -p2 -x 'Chart.yaml' \
-  | filterdiff -p1 -i 'neutron/*' \
-  | patch -p2 -d ${ATMOSPHERE}/charts/neutron
-curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899716/revisions/1/patch?download' \
-  | base64 --decode \
-  | filterdiff -p1 -x 'releasenotes/*' \
-  | filterdiff -p2 -x 'Chart.yaml' \
-  | filterdiff -p1 -i 'neutron/*' \
-  | patch -p2 -d ${ATMOSPHERE}/charts/neutron
-curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899933/revisions/1/patch?download' \
-  | base64 --decode \
-  | filterdiff -p1 -x 'releasenotes/*' \
-  | filterdiff -p2 -x 'Chart.yaml' \
-  | filterdiff -p1 -i 'neutron/*' \
-  | patch -p2 -d ${ATMOSPHERE}/charts/neutron
-
-NOVA_VERISON=0.3.27
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/nova-${NOVA_VERISON}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Nova
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899809/revisions/2/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -194,9 +83,7 @@
   | filterdiff -p1 -i 'nova/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/nova
 
-SENLIN_VERSION=0.2.9
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/senlin-${SENLIN_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Senlin
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899913/revisions/1/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -204,9 +91,7 @@
   | filterdiff -p1 -i 'senlin/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/senlin
 
-DESIGNATE_VERSION=0.2.9
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/designate-${DESIGNATE_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Designate
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899932/revisions/1/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -214,9 +99,7 @@
   | filterdiff -p1 -i 'designate/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/designate
 
-HEAT_VERSION=0.3.7
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/heat-${HEAT_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Heat
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899931/revisions/1/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -224,9 +107,7 @@
   | filterdiff -p1 -i 'heat/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/heat
 
-OCTAVIA_VERSION=0.2.9
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/octavia-${OCTAVIA_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Octavia
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899918/revisions/1/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -234,9 +115,7 @@
   | filterdiff -p1 -i 'octavia/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/octavia
 
-MAGNUM_VERSION=0.2.9
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/magnum-${MAGNUM_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Magnum
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~899926/revisions/1/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -244,25 +123,7 @@
   | filterdiff -p1 -i 'magnum/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/magnum
 
-HORIZON_VERSION=0.3.15
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/horizon-${HORIZON_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-TEMPEST_VERSION=0.2.8
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/tempest-${TEMPEST_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-ROOK_CEPH_VERSION=1.10.10
-curl -sL https://charts.rook.io/release/rook-ceph-v${ROOK_CEPH_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-ROOK_CEPH_CLUSTER_VERSION=1.10.10
-curl -sL https://charts.rook.io/release/rook-ceph-cluster-v${ROOK_CEPH_CLUSTER_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
-
-MANILA_VERSION=0.1.7
-curl -sL https://tarballs.opendev.org/openstack/openstack-helm/manila-${MANILA_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts
+# Manila
 curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~883168/revisions/11/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
@@ -275,7 +136,3 @@
   | filterdiff -p2 -x 'Chart.yaml' \
   | filterdiff -p1 -i 'manila/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/manila
-
-KEYCLOAK_VERSION=16.0.3
-curl -sL https://charts.bitnami.com/bitnami/keycloak-${KEYCLOAK_VERSION}.tgz \
-  | tar -xz -C ${ATMOSPHERE}/charts