diff --git a/plugins/filter/openstack_helm_image_tags.py b/plugins/filter/openstack_helm_image_tags.py
index f3fa663..b5a1ff5 100644
--- a/plugins/filter/openstack_helm_image_tags.py
+++ b/plugins/filter/openstack_helm_image_tags.py
@@ -55,6 +55,7 @@
 """
 
 SKIP_LIST = [
+    "db_migrate",
     "image_repo_sync",
     "nova_wait_for_computes_init",
     "purge_test",
diff --git a/roles/openstack_helm_barbican/vars/main.yml b/roles/openstack_helm_barbican/vars/main.yml
index 54c655e..25766cd 100644
--- a/roles/openstack_helm_barbican/vars/main.yml
+++ b/roles/openstack_helm_barbican/vars/main.yml
@@ -16,17 +16,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('barbican') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_cinder/vars/main.yml b/roles/openstack_helm_cinder/vars/main.yml
index 6c733fc..2c2652e 100644
--- a/roles/openstack_helm_cinder/vars/main.yml
+++ b/roles/openstack_helm_cinder/vars/main.yml
@@ -16,23 +16,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('cinder') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_designate/vars/main.yml b/roles/openstack_helm_designate/vars/main.yml
index 732d9dc..8424f69 100644
--- a/roles/openstack_helm_designate/vars/main.yml
+++ b/roles/openstack_helm_designate/vars/main.yml
@@ -17,22 +17,7 @@
     pools: "{{ openstack_helm_designate_pools }}"
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('designate') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_glance/vars/main.yml b/roles/openstack_helm_glance/vars/main.yml
index de1ffe2..f3f1246 100644
--- a/roles/openstack_helm_glance/vars/main.yml
+++ b/roles/openstack_helm_glance/vars/main.yml
@@ -17,20 +17,7 @@
   storage: rbd
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('glance') }}"
   bootstrap:
     enabled: false
   pod:
diff --git a/roles/openstack_helm_heat/vars/main.yml b/roles/openstack_helm_heat/vars/main.yml
index 5137e10..2edb508 100644
--- a/roles/openstack_helm_heat/vars/main.yml
+++ b/roles/openstack_helm_heat/vars/main.yml
@@ -17,22 +17,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('heat') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_horizon/vars/main.yml b/roles/openstack_helm_horizon/vars/main.yml
index 7057c54..e7d80fc 100644
--- a/roles/openstack_helm_horizon/vars/main.yml
+++ b/roles/openstack_helm_horizon/vars/main.yml
@@ -16,17 +16,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('horizon') }}"
   pod:
     replicas:
       server: 3
diff --git a/roles/openstack_helm_infra_libvirt/vars/main.yml b/roles/openstack_helm_infra_libvirt/vars/main.yml
index 3fdbebf..5ade112 100644
--- a/roles/openstack_helm_infra_libvirt/vars/main.yml
+++ b/roles/openstack_helm_infra_libvirt/vars/main.yml
@@ -15,10 +15,7 @@
 _openstack_helm_infra_libvirt_values:
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('libvirt') }}"
   conf:
     ceph:
       enabled: "{{ atmosphere_ceph_enabled | default(true) | bool }}"
diff --git a/roles/openstack_helm_infra_openvswitch/vars/main.yml b/roles/openstack_helm_infra_openvswitch/vars/main.yml
index 8febbd6..82c8ede 100644
--- a/roles/openstack_helm_infra_openvswitch/vars/main.yml
+++ b/roles/openstack_helm_infra_openvswitch/vars/main.yml
@@ -15,7 +15,4 @@
 _openstack_helm_infra_openvswitch_values:
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('openvswitch') }}"
diff --git a/roles/openstack_helm_keystone/vars/main.yml b/roles/openstack_helm_keystone/vars/main.yml
index d2655e3..705ad23 100644
--- a/roles/openstack_helm_keystone/vars/main.yml
+++ b/roles/openstack_helm_keystone/vars/main.yml
@@ -16,21 +16,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('keystone') }}"
   pod:
     #     mounts = {
     #       keystone_api = {
diff --git a/roles/openstack_helm_neutron/vars/main.yml b/roles/openstack_helm_neutron/vars/main.yml
index 1da4f5c..221ebb4 100644
--- a/roles/openstack_helm_neutron/vars/main.yml
+++ b/roles/openstack_helm_neutron/vars/main.yml
@@ -16,28 +16,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('neutron') }}"
   pod:
     replicas:
       server: 3
diff --git a/roles/openstack_helm_nova/vars/main.yml b/roles/openstack_helm_nova/vars/main.yml
index b2f6b0e..7e20f5b 100644
--- a/roles/openstack_helm_nova/vars/main.yml
+++ b/roles/openstack_helm_nova/vars/main.yml
@@ -22,32 +22,7 @@
         node_selector_value: enabled
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('nova') }}"
   network:
     ssh:
       enabled: true
diff --git a/roles/openstack_helm_octavia/vars/main.yml b/roles/openstack_helm_octavia/vars/main.yml
index d18ea1a..017aa32 100644
--- a/roles/openstack_helm_octavia/vars/main.yml
+++ b/roles/openstack_helm_octavia/vars/main.yml
@@ -15,22 +15,7 @@
 _openstack_helm_octavia_values:
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('octavia') }}"
   pod:
     mounts:
       octavia_api:
diff --git a/roles/openstack_helm_placement/vars/main.yml b/roles/openstack_helm_placement/vars/main.yml
index cb2b587..40071a1 100644
--- a/roles/openstack_helm_placement/vars/main.yml
+++ b/roles/openstack_helm_placement/vars/main.yml
@@ -16,17 +16,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('placement') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_senlin/vars/main.yml b/roles/openstack_helm_senlin/vars/main.yml
index 8872db1..9699171 100644
--- a/roles/openstack_helm_senlin/vars/main.yml
+++ b/roles/openstack_helm_senlin/vars/main.yml
@@ -17,21 +17,7 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     pull_policy: Always
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('senlin') }}"
   pod:
     replicas:
       api: 3
diff --git a/roles/openstack_helm_tempest/vars/main.yml b/roles/openstack_helm_tempest/vars/main.yml
index cbef44b..81da796 100644
--- a/roles/openstack_helm_tempest/vars/main.yml
+++ b/roles/openstack_helm_tempest/vars/main.yml
@@ -15,10 +15,7 @@
 _openstack_helm_tempest_values:
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
-    tags:
-      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') }}"
+    tags: "{{ atmosphere_images | openstack_helm_image_tags('tempest') }}"
   jobs:
     run_tests:
       restartPolicy: Never