diff --git a/roles/atmosphere/defaults/main.yml b/roles/atmosphere/defaults/main.yml
index 2de18fc..c50fba3 100644
--- a/roles/atmosphere/defaults/main.yml
+++ b/roles/atmosphere/defaults/main.yml
@@ -1,4 +1,4 @@
-atmosphere_image: "{{ lookup('vexxhost.atmosphere.image_ref', 'atmosphere', output='ref') }}"
+atmosphere_image: "{{ atmosphere_images['atmosphere'] | docker_image('ref') }}"
 
 atmosphere_config:
   image_repository: "{{ atmosphere_image_repository | default('') }}"
diff --git a/roles/atmosphere/meta/main.yml b/roles/atmosphere/meta/main.yml
index 894f7b0..a3fa3ec 100644
--- a/roles/atmosphere/meta/main.yml
+++ b/roles/atmosphere/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: percona_xtradb_cluster
diff --git a/roles/ceph_csi_rbd/meta/main.yml b/roles/ceph_csi_rbd/meta/main.yml
index f37c955..e113fd6 100644
--- a/roles/ceph_csi_rbd/meta/main.yml
+++ b/roles/ceph_csi_rbd/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/ceph_csi_rbd/tasks/main.yml b/roles/ceph_csi_rbd/tasks/main.yml
index fdb34ae..4df8040 100644
--- a/roles/ceph_csi_rbd/tasks/main.yml
+++ b/roles/ceph_csi_rbd/tasks/main.yml
@@ -80,25 +80,25 @@
                 containerPort: 8081
               registrar:
                 image:
-                  repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'csi_node_driver_registrar', output='name') }}"
+                  repository: "{{ atmosphere_images['csi_node_driver_registrar'] | docker_image('name') }}"
               plugin:
                 image:
-                  repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'csi_rbd_plugin', output='name') }}"
+                  repository: "{{ atmosphere_images['csi_rbd_plugin'] | docker_image('name') }}"
             provisioner:
               nodeSelector:
                 openstack-control-plane: enabled
               provisioner:
                 image:
-                  repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'csi_rbd_provisioner', output='name') }}"
+                  repository: "{{ atmosphere_images['csi_rbd_provisioner'] | docker_image('name') }}"
               attacher:
                 image:
-                  repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'csi_rbd_attacher', output='name') }}"
+                  repository: "{{ atmosphere_images['csi_rbd_attacher'] | docker_image('name') }}"
               resizer:
                 image:
-                  repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'csi_rbd_resizer', output='name') }}"
+                  repository: "{{ atmosphere_images['csi_rbd_resizer'] | docker_image('name') }}"
               snapshotter:
                 image:
-                  repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'csi_rbd_snapshotter', output='name') }}"
+                  repository: "{{ atmosphere_images['csi_rbd_snapshotter'] | docker_image('name') }}"
             storageClass:
               create: true
               name: general
diff --git a/roles/ceph_mgr/meta/main.yml b/roles/ceph_mgr/meta/main.yml
index 02731b2..cec72d8 100644
--- a/roles/ceph_mgr/meta/main.yml
+++ b/roles/ceph_mgr/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/ceph_mon/meta/main.yml b/roles/ceph_mon/meta/main.yml
index 2f62fe3..d59c2bc 100644
--- a/roles/ceph_mon/meta/main.yml
+++ b/roles/ceph_mon/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/ceph_osd/meta/main.yml b/roles/ceph_osd/meta/main.yml
index 567fe76..bd74938 100644
--- a/roles/ceph_osd/meta/main.yml
+++ b/roles/ceph_osd/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/ceph_repository/meta/main.yml b/roles/ceph_repository/meta/main.yml
index 4c62a55..2e86618 100644
--- a/roles/ceph_repository/meta/main.yml
+++ b/roles/ceph_repository/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/certificates/meta/main.yml b/roles/certificates/meta/main.yml
index 4d6cbdd..921f51d 100644
--- a/roles/certificates/meta/main.yml
+++ b/roles/certificates/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/cilium/meta/main.yml b/roles/cilium/meta/main.yml
index 277da2b..6711832 100644
--- a/roles/cilium/meta/main.yml
+++ b/roles/cilium/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/cilium/tasks/main.yml b/roles/cilium/tasks/main.yml
index def4496..2322c3d 100644
--- a/roles/cilium/tasks/main.yml
+++ b/roles/cilium/tasks/main.yml
@@ -26,11 +26,11 @@
     kubeconfig: /etc/kubernetes/admin.conf
     values:
       image:
-        repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'cilium_node', output='name') }}"
+        repository: "{{ atmosphere_images['cilium_node'] | docker_image('name') }}"
       tunnel: geneve
       operator:
         image:
-          repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'cilium_operator', output='name') | replace('-generic', '') }}"
+          repository: "{{ atmosphere_images['cilium_operator'] | docker_image('name') | replace('-generic', '') }}"
         nodeSelector:
           openstack-control-plane: enabled
       ipam:
diff --git a/roles/containerd/meta/main.yml b/roles/containerd/meta/main.yml
index 9e9d45b..a9d5c50 100644
--- a/roles/containerd/meta/main.yml
+++ b/roles/containerd/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/coredns/meta/main.yml b/roles/coredns/meta/main.yml
index ee1b019..2a09ce9 100644
--- a/roles/coredns/meta/main.yml
+++ b/roles/coredns/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/coredns/tasks/main.yml b/roles/coredns/tasks/main.yml
index dceb12b..89b4972 100644
--- a/roles/coredns/tasks/main.yml
+++ b/roles/coredns/tasks/main.yml
@@ -32,7 +32,7 @@
                 name: coredns
           values:
             image:
-              repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_coredns', output='name') }}"
+              repository: "{{ atmosphere_images['neutron_coredns'] | docker_image('name') }}"
             replicaCount: 3
             prometheus:
               service:
diff --git a/roles/csi/meta/main.yml b/roles/csi/meta/main.yml
index cf5300e..5386ec6 100644
--- a/roles/csi/meta/main.yml
+++ b/roles/csi/meta/main.yml
@@ -24,6 +24,7 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: ceph_csi_rbd
     when: csi_driver == "rbd"
   - role: powerstore_csi
diff --git a/roles/defaults/defaults/main.yml b/roles/defaults/defaults/main.yml
index bee0fe0..5be9cd5 100644
--- a/roles/defaults/defaults/main.yml
+++ b/roles/defaults/defaults/main.yml
@@ -1,6 +1,6 @@
 atmosphere_images:
   alertmanager: quay.io/prometheus/alertmanager:v0.24.0
-  atmosphere: quay.io/vexxhost/atmosphere:0.13.0
+  atmosphere: quay.io/vexxhost/atmosphere:0.13.0 # x-release-please-version
   barbican_api: quay.io/vexxhost/barbican:wallaby
   barbican_db_sync: quay.io/vexxhost/barbican:wallaby
   bootstrap: quay.io/vexxhost/heat:zed
diff --git a/roles/ethtool/meta/main.yml b/roles/ethtool/meta/main.yml
index 908b511..21983bd 100644
--- a/roles/ethtool/meta/main.yml
+++ b/roles/ethtool/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/flux/meta/main.yml b/roles/flux/meta/main.yml
index 1304b1b..d270235 100644
--- a/roles/flux/meta/main.yml
+++ b/roles/flux/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/helm/meta/main.yml b/roles/helm/meta/main.yml
index a6761a1..1a99027 100644
--- a/roles/helm/meta/main.yml
+++ b/roles/helm/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/helm_diff/meta/main.yml b/roles/helm_diff/meta/main.yml
index c9952e4..ea14fec 100644
--- a/roles/helm_diff/meta/main.yml
+++ b/roles/helm_diff/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/ipmi_exporter/meta/main.yml b/roles/ipmi_exporter/meta/main.yml
index c5e9602..c1b1b53 100644
--- a/roles/ipmi_exporter/meta/main.yml
+++ b/roles/ipmi_exporter/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/ipmi_exporter/tasks/main.yml b/roles/ipmi_exporter/tasks/main.yml
index 31cd4c4..b4bee04 100644
--- a/roles/ipmi_exporter/tasks/main.yml
+++ b/roles/ipmi_exporter/tasks/main.yml
@@ -47,7 +47,7 @@
             spec:
               containers:
                 - name: exporter
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'prometheus_ipmi_exporter', output='ref') }}"
+                  image: "{{ atmosphere_images['prometheus_ipmi_exporter'] | docker_image('ref') }}"
                   ports:
                     - name: metrics
                       containerPort: 9290
diff --git a/roles/keepalived/meta/main.yml b/roles/keepalived/meta/main.yml
index 40cbf9b..6bec4d0 100644
--- a/roles/keepalived/meta/main.yml
+++ b/roles/keepalived/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/keepalived/tasks/main.yml b/roles/keepalived/tasks/main.yml
index d401c4b..3ba71b9 100644
--- a/roles/keepalived/tasks/main.yml
+++ b/roles/keepalived/tasks/main.yml
@@ -118,7 +118,7 @@
               automountServiceAccountToken: true
               initContainers:
                 - name: init
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
+                  image: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
                   env:
                     - name: NAMESPACE
                       valueFrom:
@@ -133,7 +133,7 @@
                     - name: DEPENDENCY_POD_JSON
                       value: '[{"labels":{"application":"neutron","component":"neutron-ovs-agent"},"requireSameNode":true}]'
                 - name: wait-for-ip
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'keepalived', output='ref') }}"
+                  image: "{{ atmosphere_images['keepalived'] | docker_image('ref') }}"
                   command:
                     - /bin/wait-for-ip.sh
                   volumeMounts:
@@ -144,7 +144,7 @@
                       subPath: wait-for-ip.sh
               containers:
                 - name: keepalived
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'keepalived', output='ref') }}"
+                  image: "{{ atmosphere_images['keepalived'] | docker_image('ref') }}"
                   command:
                     - keepalived
                     - -f
diff --git a/roles/kube_prometheus_stack/meta/main.yml b/roles/kube_prometheus_stack/meta/main.yml
index a6bf0d3..8dc536b 100644
--- a/roles/kube_prometheus_stack/meta/main.yml
+++ b/roles/kube_prometheus_stack/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/kubernetes/meta/main.yml b/roles/kubernetes/meta/main.yml
index c2c9f7e..ef85549 100644
--- a/roles/kubernetes/meta/main.yml
+++ b/roles/kubernetes/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: containerd
diff --git a/roles/kubernetes/templates/haproxy.yaml.j2 b/roles/kubernetes/templates/haproxy.yaml.j2
index e780b05..d47c015 100644
--- a/roles/kubernetes/templates/haproxy.yaml.j2
+++ b/roles/kubernetes/templates/haproxy.yaml.j2
@@ -6,7 +6,7 @@
 spec:
   containers:
     - name: haproxy
-      image: "{{ lookup('vexxhost.atmosphere.image_ref', 'haproxy', output='ref') }}"
+      image: "{{ atmosphere_images['haproxy'] | docker_image('ref') }}"
       livenessProbe:
         failureThreshold: 8
         httpGet:
diff --git a/roles/kubernetes/templates/keepalived.yaml.j2 b/roles/kubernetes/templates/keepalived.yaml.j2
index 0312b42..3a350d7 100644
--- a/roles/kubernetes/templates/keepalived.yaml.j2
+++ b/roles/kubernetes/templates/keepalived.yaml.j2
@@ -7,7 +7,7 @@
 spec:
   containers:
     - name: keepalived
-      image: "{{ lookup('vexxhost.atmosphere.image_ref', 'keepalived', output='ref') }}"
+      image: "{{ atmosphere_images['keepalived'] | docker_image('ref') }}"
       command: ["keepalived", "-f", "/etc/keepalived/keepalived.conf", "--dont-fork", "--log-console", "--log-detail", "--dump-conf"]
       resources: {}
       securityContext:
diff --git a/roles/openstack_cli/meta/main.yml b/roles/openstack_cli/meta/main.yml
index d1ef07b..3108e1f 100644
--- a/roles/openstack_cli/meta/main.yml
+++ b/roles/openstack_cli/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: certificates
diff --git a/roles/openstack_exporter/meta/main.yml b/roles/openstack_exporter/meta/main.yml
index f744a00..f1ae025 100644
--- a/roles/openstack_exporter/meta/main.yml
+++ b/roles/openstack_exporter/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/openstack_exporter/tasks/main.yml b/roles/openstack_exporter/tasks/main.yml
index 83cf8c1..2af8ece 100644
--- a/roles/openstack_exporter/tasks/main.yml
+++ b/roles/openstack_exporter/tasks/main.yml
@@ -65,7 +65,7 @@
                       mountPath: /etc/openstack
               containers:
                 - name: openstack-exporter
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'prometheus_openstack_exporter', output='ref') }}"
+                  image: "{{ atmosphere_images['prometheus_openstack_exporter'] | docker_image('ref') }}"
                   args:
                     - --endpoint-type
                     - internal
diff --git a/roles/openstack_helm_barbican/meta/main.yml b/roles/openstack_helm_barbican/meta/main.yml
index f479c17..93ef377 100644
--- a/roles/openstack_helm_barbican/meta/main.yml
+++ b/roles/openstack_helm_barbican/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_barbican/vars/main.yml b/roles/openstack_helm_barbican/vars/main.yml
index 0b3f894..54c655e 100644
--- a/roles/openstack_helm_barbican/vars/main.yml
+++ b/roles/openstack_helm_barbican/vars/main.yml
@@ -17,16 +17,16 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      barbican_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'barbican_db_sync', output='ref') }}"
-      barbican_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'barbican_api', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      barbican_db_sync: "{{ atmosphere_images['barbican_db_sync'] | docker_image('ref') }}"
+      barbican_api: "{{ atmosphere_images['barbican_api'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_cinder/meta/main.yml b/roles/openstack_helm_cinder/meta/main.yml
index e44991a..f326dc9 100644
--- a/roles/openstack_helm_cinder/meta/main.yml
+++ b/roles/openstack_helm_cinder/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_cinder/vars/main.yml b/roles/openstack_helm_cinder/vars/main.yml
index f2c5347..6c733fc 100644
--- a/roles/openstack_helm_cinder/vars/main.yml
+++ b/roles/openstack_helm_cinder/vars/main.yml
@@ -17,22 +17,22 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      cinder_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_api', output='ref') }}"
-      cinder_backup_storage_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_backup_storage_init', output='ref') }}"
-      cinder_backup: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_backup', output='ref') }}"
-      cinder_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_db_sync', output='ref') }}"
-      cinder_scheduler: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_scheduler', output='ref') }}"
-      cinder_storage_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_storage_init', output='ref') }}"
-      cinder_volume_usage_audit: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_volume_usage_audit', output='ref') }}"
-      cinder_volume: "{{ lookup('vexxhost.atmosphere.image_ref', 'cinder_volume', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      cinder_api: "{{ atmosphere_images['cinder_api'] | docker_image('ref') }}"
+      cinder_backup_storage_init: "{{ atmosphere_images['cinder_backup_storage_init'] | docker_image('ref') }}"
+      cinder_backup: "{{ atmosphere_images['cinder_backup'] | docker_image('ref') }}"
+      cinder_db_sync: "{{ atmosphere_images['cinder_db_sync'] | docker_image('ref') }}"
+      cinder_scheduler: "{{ atmosphere_images['cinder_scheduler'] | docker_image('ref') }}"
+      cinder_storage_init: "{{ atmosphere_images['cinder_storage_init'] | docker_image('ref') }}"
+      cinder_volume_usage_audit: "{{ atmosphere_images['cinder_volume_usage_audit'] | docker_image('ref') }}"
+      cinder_volume: "{{ atmosphere_images['cinder_volume'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_designate/meta/main.yml b/roles/openstack_helm_designate/meta/main.yml
index c0d03fc..1519a2f 100644
--- a/roles/openstack_helm_designate/meta/main.yml
+++ b/roles/openstack_helm_designate/meta/main.yml
@@ -23,4 +23,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_designate/vars/main.yml b/roles/openstack_helm_designate/vars/main.yml
index a4a209e..732d9dc 100644
--- a/roles/openstack_helm_designate/vars/main.yml
+++ b/roles/openstack_helm_designate/vars/main.yml
@@ -18,21 +18,21 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      designate_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'designate_db_sync', output='ref') }}"
-      designate_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'designate_api', output='ref') }}"
-      designate_central: "{{ lookup('vexxhost.atmosphere.image_ref', 'designate_central', output='ref') }}"
-      designate_mdns: "{{ lookup('vexxhost.atmosphere.image_ref', 'designate_mdns', output='ref') }}"
-      designate_worker: "{{ lookup('vexxhost.atmosphere.image_ref', 'designate_worker', output='ref') }}"
-      designate_producer: "{{ lookup('vexxhost.atmosphere.image_ref', 'designate_producer', output='ref') }}"
-      designate_sink: "{{ lookup('vexxhost.atmosphere.image_ref', 'designate_sink', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      designate_db_sync: "{{ atmosphere_images['designate_db_sync'] | docker_image('ref') }}"
+      designate_api: "{{ atmosphere_images['designate_api'] | docker_image('ref') }}"
+      designate_central: "{{ atmosphere_images['designate_central'] | docker_image('ref') }}"
+      designate_mdns: "{{ atmosphere_images['designate_mdns'] | docker_image('ref') }}"
+      designate_worker: "{{ atmosphere_images['designate_worker'] | docker_image('ref') }}"
+      designate_producer: "{{ atmosphere_images['designate_producer'] | docker_image('ref') }}"
+      designate_sink: "{{ atmosphere_images['designate_sink'] | docker_image('ref') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_endpoints/meta/main.yml b/roles/openstack_helm_endpoints/meta/main.yml
index 4fff693..f1f501b 100644
--- a/roles/openstack_helm_endpoints/meta/main.yml
+++ b/roles/openstack_helm_endpoints/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/openstack_helm_glance/meta/main.yml b/roles/openstack_helm_glance/meta/main.yml
index d286883..5e40a4f 100644
--- a/roles/openstack_helm_glance/meta/main.yml
+++ b/roles/openstack_helm_glance/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: openstacksdk
diff --git a/roles/openstack_helm_glance/vars/main.yml b/roles/openstack_helm_glance/vars/main.yml
index 8053896..de1ffe2 100644
--- a/roles/openstack_helm_glance/vars/main.yml
+++ b/roles/openstack_helm_glance/vars/main.yml
@@ -18,19 +18,19 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      glance_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'glance_api', output='ref') }}"
-      glance_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'glance_db_sync', output='ref') }}"
-      glance_metadefs_load: "{{ lookup('vexxhost.atmosphere.image_ref', 'glance_metadefs_load', output='ref') }}"
-      glance_registry: "{{ lookup('vexxhost.atmosphere.image_ref', 'glance_registry', output='ref') }}"
-      glance_storage_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'glance_storage_init', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      glance_api: "{{ atmosphere_images['glance_api'] | docker_image('ref') }}"
+      glance_db_sync: "{{ atmosphere_images['glance_db_sync'] | docker_image('ref') }}"
+      glance_metadefs_load: "{{ atmosphere_images['glance_metadefs_load'] | docker_image('ref') }}"
+      glance_registry: "{{ atmosphere_images['glance_registry'] | docker_image('ref') }}"
+      glance_storage_init: "{{ atmosphere_images['glance_storage_init'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   bootstrap:
     enabled: false
   pod:
diff --git a/roles/openstack_helm_heat/meta/main.yml b/roles/openstack_helm_heat/meta/main.yml
index 3a7140b..c2bea65 100644
--- a/roles/openstack_helm_heat/meta/main.yml
+++ b/roles/openstack_helm_heat/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_heat/vars/main.yml b/roles/openstack_helm_heat/vars/main.yml
index 1eb2bc9..5137e10 100644
--- a/roles/openstack_helm_heat/vars/main.yml
+++ b/roles/openstack_helm_heat/vars/main.yml
@@ -18,21 +18,21 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      heat_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'heat_api', output='ref') }}"
-      heat_cfn: "{{ lookup('vexxhost.atmosphere.image_ref', 'heat_cfn', output='ref') }}"
-      heat_cloudwatch: "{{ lookup('vexxhost.atmosphere.image_ref', 'heat_cloudwatch', output='ref') }}"
-      heat_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'heat_db_sync', output='ref') }}"
-      heat_engine_cleaner: "{{ lookup('vexxhost.atmosphere.image_ref', 'heat_engine_cleaner', output='ref') }}"
-      heat_engine: "{{ lookup('vexxhost.atmosphere.image_ref', 'heat_engine', output='ref') }}"
-      heat_purge_deleted: "{{ lookup('vexxhost.atmosphere.image_ref', 'heat_purge_deleted', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      heat_api: "{{ atmosphere_images['heat_api'] | docker_image('ref') }}"
+      heat_cfn: "{{ atmosphere_images['heat_cfn'] | docker_image('ref') }}"
+      heat_cloudwatch: "{{ atmosphere_images['heat_cloudwatch'] | docker_image('ref') }}"
+      heat_db_sync: "{{ atmosphere_images['heat_db_sync'] | docker_image('ref') }}"
+      heat_engine_cleaner: "{{ atmosphere_images['heat_engine_cleaner'] | docker_image('ref') }}"
+      heat_engine: "{{ atmosphere_images['heat_engine'] | docker_image('ref') }}"
+      heat_purge_deleted: "{{ atmosphere_images['heat_purge_deleted'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_horizon/meta/main.yml b/roles/openstack_helm_horizon/meta/main.yml
index f101c63..81ab193 100644
--- a/roles/openstack_helm_horizon/meta/main.yml
+++ b/roles/openstack_helm_horizon/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_horizon/vars/main.yml b/roles/openstack_helm_horizon/vars/main.yml
index d4c6b86..7057c54 100644
--- a/roles/openstack_helm_horizon/vars/main.yml
+++ b/roles/openstack_helm_horizon/vars/main.yml
@@ -17,16 +17,16 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      horizon_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'horizon_db_sync', output='ref') }}"
-      horizon: "{{ lookup('vexxhost.atmosphere.image_ref', 'horizon', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      horizon_db_sync: "{{ atmosphere_images['horizon_db_sync'] | docker_image('ref') }}"
+      horizon: "{{ atmosphere_images['horizon'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   pod:
     replicas:
       server: 3
diff --git a/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml b/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
index 7d77a96..973189b 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
@@ -24,5 +24,6 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
   - role: ceph_csi_rbd
diff --git a/roles/openstack_helm_infra_libvirt/meta/main.yml b/roles/openstack_helm_infra_libvirt/meta/main.yml
index d794993..e2cd428 100644
--- a/roles/openstack_helm_infra_libvirt/meta/main.yml
+++ b/roles/openstack_helm_infra_libvirt/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_infra_libvirt/vars/main.yml b/roles/openstack_helm_infra_libvirt/vars/main.yml
index d02c0ca..3fdbebf 100644
--- a/roles/openstack_helm_infra_libvirt/vars/main.yml
+++ b/roles/openstack_helm_infra_libvirt/vars/main.yml
@@ -16,9 +16,9 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags:
-      ceph_config_helper: "{{ lookup('vexxhost.atmosphere.image_ref', 'ceph_config_helper', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      libvirt: "{{ lookup('vexxhost.atmosphere.image_ref', 'libvirt', output='ref') }}"
+      ceph_config_helper: "{{ atmosphere_images['ceph_config_helper'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      libvirt: "{{ atmosphere_images['libvirt'] | docker_image('ref') }}"
   conf:
     ceph:
       enabled: "{{ atmosphere_ceph_enabled | default(true) | bool }}"
diff --git a/roles/openstack_helm_infra_openvswitch/meta/main.yml b/roles/openstack_helm_infra_openvswitch/meta/main.yml
index bc3f67d..834cb7c 100644
--- a/roles/openstack_helm_infra_openvswitch/meta/main.yml
+++ b/roles/openstack_helm_infra_openvswitch/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/openstack_helm_infra_openvswitch/vars/main.yml b/roles/openstack_helm_infra_openvswitch/vars/main.yml
index f4cb234..8febbd6 100644
--- a/roles/openstack_helm_infra_openvswitch/vars/main.yml
+++ b/roles/openstack_helm_infra_openvswitch/vars/main.yml
@@ -16,6 +16,6 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags:
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      openvswitch_db_server: "{{ lookup('vexxhost.atmosphere.image_ref', 'openvswitch_db_server', output='ref') }}"
-      openvswitch_vswitchd: "{{ lookup('vexxhost.atmosphere.image_ref', 'openvswitch_vswitchd', output='ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      openvswitch_db_server: "{{ atmosphere_images['openvswitch_db_server'] | docker_image('ref') }}"
+      openvswitch_vswitchd: "{{ atmosphere_images['openvswitch_vswitchd'] | docker_image('ref') }}"
diff --git a/roles/openstack_helm_ingress/meta/main.yml b/roles/openstack_helm_ingress/meta/main.yml
index 7ad90e3..6f22baa 100644
--- a/roles/openstack_helm_ingress/meta/main.yml
+++ b/roles/openstack_helm_ingress/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/openstack_helm_keystone/meta/main.yml b/roles/openstack_helm_keystone/meta/main.yml
index 4929cc5..e112da0 100644
--- a/roles/openstack_helm_keystone/meta/main.yml
+++ b/roles/openstack_helm_keystone/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_keystone/vars/main.yml b/roles/openstack_helm_keystone/vars/main.yml
index 73b200b..d2655e3 100644
--- a/roles/openstack_helm_keystone/vars/main.yml
+++ b/roles/openstack_helm_keystone/vars/main.yml
@@ -17,20 +17,20 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      keystone_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_api', output='ref') }}"
-      keystone_credential_cleanup: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_credential_cleanup', output='ref') }}"
-      keystone_credential_rotate: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_credential_rotate', output='ref') }}"
-      keystone_credential_setup: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_credential_setup', output='ref') }}"
-      keystone_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_db_sync', output='ref') }}"
-      keystone_domain_manage: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_domain_manage', output='ref') }}"
-      keystone_fernet_rotate: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_fernet_rotate', output='ref') }}"
-      keystone_fernet_setup: "{{ lookup('vexxhost.atmosphere.image_ref', 'keystone_fernet_setup', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      keystone_api: "{{ atmosphere_images['keystone_api'] | docker_image('ref') }}"
+      keystone_credential_cleanup: "{{ atmosphere_images['keystone_credential_cleanup'] | docker_image('ref') }}"
+      keystone_credential_rotate: "{{ atmosphere_images['keystone_credential_rotate'] | docker_image('ref') }}"
+      keystone_credential_setup: "{{ atmosphere_images['keystone_credential_setup'] | docker_image('ref') }}"
+      keystone_db_sync: "{{ atmosphere_images['keystone_db_sync'] | docker_image('ref') }}"
+      keystone_domain_manage: "{{ atmosphere_images['keystone_domain_manage'] | docker_image('ref') }}"
+      keystone_fernet_rotate: "{{ atmosphere_images['keystone_fernet_rotate'] | docker_image('ref') }}"
+      keystone_fernet_setup: "{{ atmosphere_images['keystone_fernet_setup'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   pod:
     #     mounts = {
     #       keystone_api = {
diff --git a/roles/openstack_helm_magnum/meta/main.yml b/roles/openstack_helm_magnum/meta/main.yml
index f2e80be..f639330 100644
--- a/roles/openstack_helm_magnum/meta/main.yml
+++ b/roles/openstack_helm_magnum/meta/main.yml
@@ -23,6 +23,7 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: openstacksdk
   - role: openstack_cli
   - role: openstack_helm_barbican
diff --git a/roles/openstack_helm_magnum/tasks/main.yml b/roles/openstack_helm_magnum/tasks/main.yml
index 69e3819..f649114 100644
--- a/roles/openstack_helm_magnum/tasks/main.yml
+++ b/roles/openstack_helm_magnum/tasks/main.yml
@@ -69,7 +69,7 @@
                       value: /var/lib/registry
                     - name: REGISTRY_COMPATIBILITY_SCHEMA1_ENABLED
                       value: "true"
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'magnum_registry', output='ref') }}"
+                  image: "{{ atmosphere_images['magnum_registry'] | docker_image('ref') }}"
                   ports:
                     - containerPort: 5000
                       name: registry
@@ -135,189 +135,189 @@
                     - --dest-tls-verify=false
                     - docker://docker.io/calico/cni:v3.13.1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/cni:v3.13.1
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-cni-v3-13-1
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/calico/kube-controllers:v3.13.1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/kube-controllers:v3.13.1
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-kube-controllers-v3-13-1
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/calico/node:v3.13.1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/node:v3.13.1
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-node-v3-13-1
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/calico/pod2daemon-flexvol:v3.13.1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/pod2daemon-flexvol:v3.13.1
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-pod2daemon-flexvol-v3-13-1
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/coredns/coredns:1.6.6
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/coredns:1.6.6
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-coredns-1-6-6
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/k8scloudprovider/cinder-csi-plugin:v1.18.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/cinder-csi-plugin:v1.18.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-cinder-csi-plugin-v1-18-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/k8scloudprovider/k8s-keystone-auth:v1.18.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/k8s-keystone-auth:v1.18.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-k8s-keystone-auth-v1-18-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/k8scloudprovider/magnum-auto-healer:v1.18.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/magnum-auto-healer:v1.18.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-magnum-auto-healer-v1-18-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/k8scloudprovider/openstack-cloud-controller-manager:v1.18.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/openstack-cloud-controller-manager:v1.18.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-openstack-cloud-controller-manager-v1-18-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/kubernetesui/dashboard:v2.0.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/dashboard:v2.0.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-dashboard-v2-0-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/kubernetesui/metrics-scraper:v1.0.4
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/metrics-scraper:v1.0.4
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-metrics-scraper-v1-0-4
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/openstackmagnum/cluster-autoscaler:v1.22.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/cluster-autoscaler:v1.22.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-cluster-autoscaler-v1-22-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/openstackmagnum/heat-container-agent:wallaby-stable-1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/heat-container-agent:wallaby-stable-1
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-heat-container-agent-wallaby-stable-1
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/planetlabs/draino:abf028a
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/draino:abf028a
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-draino-abf028a
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/rancher/hyperkube:v1.19.11-rancher1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/hyperkube:v1.19.11
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-hyperkube-v1-19-11
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/rancher/hyperkube:v1.20.7-rancher1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/hyperkube:v1.20.7
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-hyperkube-v1-20-7
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://docker.io/rancher/hyperkube:v1.21.1-rancher1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/hyperkube:v1.21.1
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-hyperkube-v1-21-1
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/cluster-proportional-autoscaler-amd64:1.1.2
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-cluster-proportional-autoscaler-amd64-1-1-2
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://gcr.io/google_containers/metrics-server-amd64:v0.3.5
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/metrics-server-amd64:v0.3.5
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-metrics-server-amd64-v0-3-5
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://gcr.io/google_containers/node-problem-detector:v0.6.2
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/node-problem-detector:v0.6.2
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-node-problem-detector-v0-6-2
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://gcr.io/google_containers/pause:3.1
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/pause:3.1
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-pause-3-1
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://quay.io/coreos/etcd:v3.4.6
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/etcd:v3.4.6
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-etcd-v3-4-6
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://quay.io/k8scsi/csi-attacher:v2.0.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/csi-attacher:v2.0.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-csi-attacher-v2-0-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/csi-node-driver-registrar:v1.1.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-csi-node-driver-registrar-v1-1-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://quay.io/k8scsi/csi-provisioner:v1.4.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/csi-provisioner:v1.4.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-csi-provisioner-v1-4-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://quay.io/k8scsi/csi-resizer:v0.3.0
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/csi-resizer:v0.3.0
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-csi-resizer-v0-3-0
                 - args:
                     - copy
                     - --dest-tls-verify=false
                     - docker://quay.io/k8scsi/csi-snapshotter:v1.2.2
                     - docker://magnum-registry.openstack.svc.cluster.local:5000/magnum/csi-snapshotter:v1.2.2
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'skopeo', output='ref') }}"
+                  image: "{{ atmosphere_images['skopeo'] | docker_image('ref') }}"
                   name: magnum-csi-snapshotter-v1-2-2
               nodeSelector:
                 openstack-control-plane: enabled
diff --git a/roles/openstack_helm_neutron/meta/main.yml b/roles/openstack_helm_neutron/meta/main.yml
index ba41c29..23ab815 100644
--- a/roles/openstack_helm_neutron/meta/main.yml
+++ b/roles/openstack_helm_neutron/meta/main.yml
@@ -24,5 +24,6 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
   - role: openstacksdk
diff --git a/roles/openstack_helm_neutron/vars/main.yml b/roles/openstack_helm_neutron/vars/main.yml
index 91003c2..1da4f5c 100644
--- a/roles/openstack_helm_neutron/vars/main.yml
+++ b/roles/openstack_helm_neutron/vars/main.yml
@@ -17,27 +17,27 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      neutron_bagpipe_bgp: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_bagpipe_bgp', output='ref') }}"
-      neutron_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_db_sync', output='ref') }}"
-      neutron_dhcp: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_dhcp', output='ref') }}"
-      neutron_ironic_agent: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_ironic_agent', output='ref') }}"
-      neutron_l2gw: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_l2gw', output='ref') }}"
-      neutron_l3: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_l3', output='ref') }}"
-      neutron_linuxbridge_agent: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_linuxbridge_agent', output='ref') }}"
-      neutron_metadata: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_metadata', output='ref') }}"
-      neutron_netns_cleanup_cron: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_netns_cleanup_cron', output='ref') }}"
-      neutron_openvswitch_agent: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_openvswitch_agent', output='ref') }}"
-      neutron_server: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_server', output='ref') }}"
-      neutron_sriov_agent_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_sriov_agent_init', output='ref') }}"
-      neutron_sriov_agent: "{{ lookup('vexxhost.atmosphere.image_ref', 'neutron_sriov_agent', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      neutron_bagpipe_bgp: "{{ atmosphere_images['neutron_bagpipe_bgp'] | docker_image('ref') }}"
+      neutron_db_sync: "{{ atmosphere_images['neutron_db_sync'] | docker_image('ref') }}"
+      neutron_dhcp: "{{ atmosphere_images['neutron_dhcp'] | docker_image('ref') }}"
+      neutron_ironic_agent: "{{ atmosphere_images['neutron_ironic_agent'] | docker_image('ref') }}"
+      neutron_l2gw: "{{ atmosphere_images['neutron_l2gw'] | docker_image('ref') }}"
+      neutron_l3: "{{ atmosphere_images['neutron_l3'] | docker_image('ref') }}"
+      neutron_linuxbridge_agent: "{{ atmosphere_images['neutron_linuxbridge_agent'] | docker_image('ref') }}"
+      neutron_metadata: "{{ atmosphere_images['neutron_metadata'] | docker_image('ref') }}"
+      neutron_netns_cleanup_cron: "{{ atmosphere_images['neutron_netns_cleanup_cron'] | docker_image('ref') }}"
+      neutron_openvswitch_agent: "{{ atmosphere_images['neutron_openvswitch_agent'] | docker_image('ref') }}"
+      neutron_server: "{{ atmosphere_images['neutron_server'] | docker_image('ref') }}"
+      neutron_sriov_agent_init: "{{ atmosphere_images['neutron_sriov_agent_init'] | docker_image('ref') }}"
+      neutron_sriov_agent: "{{ atmosphere_images['neutron_sriov_agent'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   pod:
     replicas:
       server: 3
diff --git a/roles/openstack_helm_nova/meta/main.yml b/roles/openstack_helm_nova/meta/main.yml
index ad12692..e249695 100644
--- a/roles/openstack_helm_nova/meta/main.yml
+++ b/roles/openstack_helm_nova/meta/main.yml
@@ -24,5 +24,6 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
   - role: openstacksdk
diff --git a/roles/openstack_helm_nova/vars/main.yml b/roles/openstack_helm_nova/vars/main.yml
index afb83b5..b2f6b0e 100644
--- a/roles/openstack_helm_nova/vars/main.yml
+++ b/roles/openstack_helm_nova/vars/main.yml
@@ -23,31 +23,31 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      nova_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_api', output='ref') }}"
-      nova_archive_deleted_rows: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_archive_deleted_rows', output='ref') }}"
-      nova_cell_setup_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_cell_setup_init', output='ref') }}"
-      nova_cell_setup: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_cell_setup', output='ref') }}"
-      nova_compute_ironic: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_compute_ironic', output='ref') }}"
-      nova_compute_ssh: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_compute_ssh', output='ref') }}"
-      nova_compute: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_compute', output='ref') }}"
-      nova_conductor: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_conductor', output='ref') }}"
-      nova_consoleauth: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_consoleauth', output='ref') }}"
-      nova_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_db_sync', output='ref') }}"
-      nova_novncproxy_assets: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_novncproxy_assets', output='ref') }}"
-      nova_novncproxy: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_novncproxy', output='ref') }}"
-      nova_placement: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_placement', output='ref') }}"
-      nova_scheduler: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_scheduler', output='ref') }}"
-      nova_service_cleaner: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_service_cleaner', output='ref') }}"
-      nova_spiceproxy_assets: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_spiceproxy_assets', output='ref') }}"
-      nova_spiceproxy: "{{ lookup('vexxhost.atmosphere.image_ref', 'nova_spiceproxy', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      nova_api: "{{ atmosphere_images['nova_api'] | docker_image('ref') }}"
+      nova_archive_deleted_rows: "{{ atmosphere_images['nova_archive_deleted_rows'] | docker_image('ref') }}"
+      nova_cell_setup_init: "{{ atmosphere_images['nova_cell_setup_init'] | docker_image('ref') }}"
+      nova_cell_setup: "{{ atmosphere_images['nova_cell_setup'] | docker_image('ref') }}"
+      nova_compute_ironic: "{{ atmosphere_images['nova_compute_ironic'] | docker_image('ref') }}"
+      nova_compute_ssh: "{{ atmosphere_images['nova_compute_ssh'] | docker_image('ref') }}"
+      nova_compute: "{{ atmosphere_images['nova_compute'] | docker_image('ref') }}"
+      nova_conductor: "{{ atmosphere_images['nova_conductor'] | docker_image('ref') }}"
+      nova_consoleauth: "{{ atmosphere_images['nova_consoleauth'] | docker_image('ref') }}"
+      nova_db_sync: "{{ atmosphere_images['nova_db_sync'] | docker_image('ref') }}"
+      nova_novncproxy_assets: "{{ atmosphere_images['nova_novncproxy_assets'] | docker_image('ref') }}"
+      nova_novncproxy: "{{ atmosphere_images['nova_novncproxy'] | docker_image('ref') }}"
+      nova_placement: "{{ atmosphere_images['nova_placement'] | docker_image('ref') }}"
+      nova_scheduler: "{{ atmosphere_images['nova_scheduler'] | docker_image('ref') }}"
+      nova_service_cleaner: "{{ atmosphere_images['nova_service_cleaner'] | docker_image('ref') }}"
+      nova_spiceproxy_assets: "{{ atmosphere_images['nova_spiceproxy_assets'] | docker_image('ref') }}"
+      nova_spiceproxy: "{{ atmosphere_images['nova_spiceproxy'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   network:
     ssh:
       enabled: true
diff --git a/roles/openstack_helm_octavia/meta/main.yml b/roles/openstack_helm_octavia/meta/main.yml
index 181e9ad..3c75a6c 100644
--- a/roles/openstack_helm_octavia/meta/main.yml
+++ b/roles/openstack_helm_octavia/meta/main.yml
@@ -23,5 +23,6 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: openstacksdk
   - role: openstack_cli
diff --git a/roles/openstack_helm_octavia/vars/main.yml b/roles/openstack_helm_octavia/vars/main.yml
index 526514f..d18ea1a 100644
--- a/roles/openstack_helm_octavia/vars/main.yml
+++ b/roles/openstack_helm_octavia/vars/main.yml
@@ -16,21 +16,21 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
-      octavia_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'octavia_api', output='ref') }}"
-      octavia_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'octavia_db_sync', output='ref') }}"
-      octavia_health_manager: "{{ lookup('vexxhost.atmosphere.image_ref', 'octavia_health_manager', output='ref') }}"
-      octavia_health_manager_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'octavia_health_manager_init', output='ref') }}"
-      octavia_housekeeping: "{{ lookup('vexxhost.atmosphere.image_ref', 'octavia_housekeeping', output='ref') }}"
-      octavia_worker: "{{ lookup('vexxhost.atmosphere.image_ref', 'octavia_worker', output='ref') }}"
-      openvswitch_vswitchd: "{{ lookup('vexxhost.atmosphere.image_ref', 'openvswitch_vswitchd', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
+      octavia_api: "{{ atmosphere_images['octavia_api'] | docker_image('ref') }}"
+      octavia_db_sync: "{{ atmosphere_images['octavia_db_sync'] | docker_image('ref') }}"
+      octavia_health_manager: "{{ atmosphere_images['octavia_health_manager'] | docker_image('ref') }}"
+      octavia_health_manager_init: "{{ atmosphere_images['octavia_health_manager_init'] | docker_image('ref') }}"
+      octavia_housekeeping: "{{ atmosphere_images['octavia_housekeeping'] | docker_image('ref') }}"
+      octavia_worker: "{{ atmosphere_images['octavia_worker'] | docker_image('ref') }}"
+      openvswitch_vswitchd: "{{ atmosphere_images['openvswitch_vswitchd'] | docker_image('ref') }}"
   pod:
     mounts:
       octavia_api:
diff --git a/roles/openstack_helm_placement/meta/main.yml b/roles/openstack_helm_placement/meta/main.yml
index c83011a..6565b75 100644
--- a/roles/openstack_helm_placement/meta/main.yml
+++ b/roles/openstack_helm_placement/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_placement/vars/main.yml b/roles/openstack_helm_placement/vars/main.yml
index 0046b8e..cb2b587 100644
--- a/roles/openstack_helm_placement/vars/main.yml
+++ b/roles/openstack_helm_placement/vars/main.yml
@@ -17,16 +17,16 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      placement_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'placement_db_sync', output='ref') }}"
-      placement: "{{ lookup('vexxhost.atmosphere.image_ref', 'placement', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      placement_db_sync: "{{ atmosphere_images['placement_db_sync'] | docker_image('ref') }}"
+      placement: "{{ atmosphere_images['placement'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_senlin/meta/main.yml b/roles/openstack_helm_senlin/meta/main.yml
index 4c25fbe..e57f280 100644
--- a/roles/openstack_helm_senlin/meta/main.yml
+++ b/roles/openstack_helm_senlin/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/openstack_helm_senlin/vars/main.yml b/roles/openstack_helm_senlin/vars/main.yml
index 462c949..8872db1 100644
--- a/roles/openstack_helm_senlin/vars/main.yml
+++ b/roles/openstack_helm_senlin/vars/main.yml
@@ -18,20 +18,20 @@
   images:
     pull_policy: Always
     tags:
-      bootstrap: "{{ lookup('vexxhost.atmosphere.image_ref', 'bootstrap', output='ref') }}"
-      db_drop: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_drop', output='ref') }}"
-      db_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'db_init', output='ref') }}"
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_endpoints: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_endpoints', output='ref') }}"
-      ks_service: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_service', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      rabbit_init: "{{ lookup('vexxhost.atmosphere.image_ref', 'rabbit_init', output='ref') }}"
-      senlin_api: "{{ lookup('vexxhost.atmosphere.image_ref', 'senlin_api', output='ref') }}"
-      senlin_conductor: "{{ lookup('vexxhost.atmosphere.image_ref', 'senlin_conductor', output='ref') }}"
-      senlin_db_sync: "{{ lookup('vexxhost.atmosphere.image_ref', 'senlin_db_sync', output='ref') }}"
-      senlin_engine_cleaner: "{{ lookup('vexxhost.atmosphere.image_ref', 'senlin_engine_cleaner', output='ref') }}"
-      senlin_engine: "{{ lookup('vexxhost.atmosphere.image_ref', 'senlin_engine', output='ref') }}"
-      senlin_health_manager: "{{ lookup('vexxhost.atmosphere.image_ref', 'senlin_health_manager', output='ref') }}"
+      bootstrap: "{{ atmosphere_images['bootstrap'] | docker_image('ref') }}"
+      db_drop: "{{ atmosphere_images['db_drop'] | docker_image('ref') }}"
+      db_init: "{{ atmosphere_images['db_init'] | docker_image('ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_endpoints: "{{ atmosphere_images['ks_endpoints'] | docker_image('ref') }}"
+      ks_service: "{{ atmosphere_images['ks_service'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      rabbit_init: "{{ atmosphere_images['rabbit_init'] | docker_image('ref') }}"
+      senlin_api: "{{ atmosphere_images['senlin_api'] | docker_image('ref') }}"
+      senlin_conductor: "{{ atmosphere_images['senlin_conductor'] | docker_image('ref') }}"
+      senlin_db_sync: "{{ atmosphere_images['senlin_db_sync'] | docker_image('ref') }}"
+      senlin_engine_cleaner: "{{ atmosphere_images['senlin_engine_cleaner'] | docker_image('ref') }}"
+      senlin_engine: "{{ atmosphere_images['senlin_engine'] | docker_image('ref') }}"
+      senlin_health_manager: "{{ atmosphere_images['senlin_health_manager'] | docker_image('ref') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_tempest/meta/main.yml b/roles/openstack_helm_tempest/meta/main.yml
index 3eacbc4..d51f71c 100644
--- a/roles/openstack_helm_tempest/meta/main.yml
+++ b/roles/openstack_helm_tempest/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: openstacksdk
diff --git a/roles/openstack_helm_tempest/vars/main.yml b/roles/openstack_helm_tempest/vars/main.yml
index 5572a0e..cbef44b 100644
--- a/roles/openstack_helm_tempest/vars/main.yml
+++ b/roles/openstack_helm_tempest/vars/main.yml
@@ -16,9 +16,9 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags:
-      dep_check: "{{ lookup('vexxhost.atmosphere.image_ref', 'dep_check', output='ref') }}"
-      ks_user: "{{ lookup('vexxhost.atmosphere.image_ref', 'ks_user', output='ref') }}"
-      tempest_run_tests: "{{ lookup('vexxhost.atmosphere.image_ref', 'tempest_run_tests', output='ref') }}"
+      dep_check: "{{ atmosphere_images['dep_check'] | docker_image('ref') }}"
+      ks_user: "{{ atmosphere_images['ks_user'] | docker_image('ref') }}"
+      tempest_run_tests: "{{ atmosphere_images['tempest_run_tests'] | docker_image('ref') }}"
   jobs:
     run_tests:
       restartPolicy: Never
diff --git a/roles/openstacksdk/meta/main.yml b/roles/openstacksdk/meta/main.yml
index 7d9c3db..285d65a 100644
--- a/roles/openstacksdk/meta/main.yml
+++ b/roles/openstacksdk/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: certificates
diff --git a/roles/percona_xtradb_cluster/meta/main.yml b/roles/percona_xtradb_cluster/meta/main.yml
index 9c28d2f..3582f32 100644
--- a/roles/percona_xtradb_cluster/meta/main.yml
+++ b/roles/percona_xtradb_cluster/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: percona_xtradb_cluster_operator
diff --git a/roles/percona_xtradb_cluster/vars/main.yml b/roles/percona_xtradb_cluster/vars/main.yml
index cd6a5b5..0aef1c6 100644
--- a/roles/percona_xtradb_cluster/vars/main.yml
+++ b/roles/percona_xtradb_cluster/vars/main.yml
@@ -3,14 +3,14 @@
   secretsName: percona-xtradb
   pxc:
     size: 3
-    image: "{{ lookup('vexxhost.atmosphere.image_ref', 'percona_xtradb_cluster', output='ref') }}"
+    image: "{{ atmosphere_images['percona_xtradb_cluster'] | docker_image('ref') }}"
     autoRecovery: true
     configuration: |
       [mysqld]
       max_connections=8192
     sidecars:
       - name: exporter
-        image: "{{ lookup('vexxhost.atmosphere.image_ref', 'prometheus_mysqld_exporter', output='ref') }}"
+        image: "{{ atmosphere_images['prometheus_mysqld_exporter'] | docker_image('ref') }}"
         env:
           - name: MONITOR_PASSWORD
             valueFrom:
@@ -36,6 +36,6 @@
   haproxy:
     enabled: true
     size: 3
-    image: "{{ lookup('vexxhost.atmosphere.image_ref', 'percona_xtradb_cluster_haproxy', output='ref') }}"
+    image: "{{ atmosphere_images['percona_xtradb_cluster_haproxy'] | docker_image('ref') }}"
     nodeSelector:
       openstack-control-plane: enabled
diff --git a/roles/percona_xtradb_cluster_operator/meta/main.yml b/roles/percona_xtradb_cluster_operator/meta/main.yml
index c523acb..aaf5af5 100644
--- a/roles/percona_xtradb_cluster_operator/meta/main.yml
+++ b/roles/percona_xtradb_cluster_operator/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/percona_xtradb_cluster_operator/vars/main.yml b/roles/percona_xtradb_cluster_operator/vars/main.yml
index 957706d..f1ebd79 100644
--- a/roles/percona_xtradb_cluster_operator/vars/main.yml
+++ b/roles/percona_xtradb_cluster_operator/vars/main.yml
@@ -1,4 +1,4 @@
 _percona_xtradb_cluster_operator_helm_values:
-  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'percona_xtradb_cluster_operator', output='ref') }}"
+  image: "{{ atmosphere_images['percona_xtradb_cluster_operator'] | docker_image('ref') }}"
   nodeSelector:
     openstack-control-plane: enabled
diff --git a/roles/powerstore_csi/meta/main.yml b/roles/powerstore_csi/meta/main.yml
index da694c3..404dca8 100644
--- a/roles/powerstore_csi/meta/main.yml
+++ b/roles/powerstore_csi/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/prometheus_ethtool_exporter/meta/main.yml b/roles/prometheus_ethtool_exporter/meta/main.yml
index f55284f..f58a81e 100644
--- a/roles/prometheus_ethtool_exporter/meta/main.yml
+++ b/roles/prometheus_ethtool_exporter/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults
diff --git a/roles/prometheus_ethtool_exporter/tasks/main.yml b/roles/prometheus_ethtool_exporter/tasks/main.yml
index 79f6ce0..fd338c4 100644
--- a/roles/prometheus_ethtool_exporter/tasks/main.yml
+++ b/roles/prometheus_ethtool_exporter/tasks/main.yml
@@ -31,7 +31,7 @@
                       valueFrom:
                         fieldRef:
                           fieldPath: status.podIP
-                  image: "{{ lookup('vexxhost.atmosphere.image_ref', 'prometheus_ethtool_exporter', output='ref') }}"
+                  image: "{{ atmosphere_images['prometheus_ethtool_exporter'] | docker_image('ref') }}"
                   args:
                     - "-L"
                     - "$(IP)"
diff --git a/roles/prometheus_pushgateway/meta/main.yml b/roles/prometheus_pushgateway/meta/main.yml
index 3532b72..e758cd3 100644
--- a/roles/prometheus_pushgateway/meta/main.yml
+++ b/roles/prometheus_pushgateway/meta/main.yml
@@ -24,4 +24,5 @@
         - focal
 
 dependencies:
+  - role: defaults
   - role: atmosphere
diff --git a/roles/prometheus_pushgateway/tasks/main.yml b/roles/prometheus_pushgateway/tasks/main.yml
index 4114ac8..a26ada5 100644
--- a/roles/prometheus_pushgateway/tasks/main.yml
+++ b/roles/prometheus_pushgateway/tasks/main.yml
@@ -32,7 +32,7 @@
                 name: prometheus-community
           values:
             image:
-              repository: "{{ lookup('vexxhost.atmosphere.image_ref', 'prometheus_pushgateway', output='name') }}"
+              repository: "{{ atmosphere_images['prometheus_pushgateway'] | docker_image('name') }}"
             nodeSelector:
               openstack-control-plane: enabled
             serviceMonitor:
diff --git a/roles/sysctl/meta/main.yml b/roles/sysctl/meta/main.yml
index f0d4658..ef14c41 100644
--- a/roles/sysctl/meta/main.yml
+++ b/roles/sysctl/meta/main.yml
@@ -22,3 +22,6 @@
     - name: Ubuntu
       versions:
         - focal
+
+dependencies:
+  - role: defaults