diff --git a/roles/edpm_prepare/tasks/kustomize_and_deploy.yml b/roles/edpm_prepare/tasks/kustomize_and_deploy.yml
index a1f94147e..57b459bca 100644
--- a/roles/edpm_prepare/tasks/kustomize_and_deploy.yml
+++ b/roles/edpm_prepare/tasks/kustomize_and_deploy.yml
@@ -37,6 +37,8 @@
       (cifmw_update_containers_ansibleee_image_url is defined) or
       (cifmw_update_containers_openstack is defined and
       cifmw_update_containers_openstack | bool) or
+      (cifmw_update_containers_custom_images is defined and
+      cifmw_update_containers_custom_images is mapping) or
       (cifmw_update_containers_watcher is defined and
       cifmw_update_containers_watcher | bool) or
       (cifmw_update_containers_ceilometersgcoreImage is defined) or
diff --git a/roles/update_containers/README.md b/roles/update_containers/README.md
index 76c50b65e..0c16633ad 100644
--- a/roles/update_containers/README.md
+++ b/roles/update_containers/README.md
@@ -18,6 +18,7 @@ If apply, please explain the privilege escalation done in this role.
 * `cifmw_update_containers_tag`: The container tag. Default to `{{ cifmw_default_container_image_tag }}` (defined in group_vars/all.yml).
 * `cifmw_update_containers_cindervolumes`: The names of the cinder volumes prefix. Default to `[]`.
 * `cifmw_update_containers_cindervolumes_extra`: Additional cinder volumes containers, meaning names and container URIs. Default to `{}`.
+* `cifmw_update_containers_custom_images`: Override any images supported by openstackversion. Default to `{}`.
 * `cifmw_update_containers_manilashares`: The names of the manila shares prefix. Default to `[]`.
 * `cifmw_update_containers_agentimage`: Full Agent Image url for updating Agent Image.
 * `cifmw_update_containers_ceilometersgcoreImage`: Full Ceilometersgcore Image url for updating Ceilometersgcore Image.
diff --git a/roles/update_containers/defaults/main.yml b/roles/update_containers/defaults/main.yml
index 711530b2b..fdc5f3e4e 100644
--- a/roles/update_containers/defaults/main.yml
+++ b/roles/update_containers/defaults/main.yml
@@ -40,6 +40,7 @@ cifmw_update_containers_rollback: false
 cifmw_update_containers_cindervolumes:
   - default
 cifmw_update_containers_cindervolumes_extra: {}
+cifmw_update_containers_custom_images: {}
 cifmw_update_containers_manilashares:
   - default
 cifmw_update_containers_watcher: false
diff --git a/roles/update_containers/templates/update_containers.j2 b/roles/update_containers/templates/update_containers.j2
index 0520b2a14..2517a2b5b 100644
--- a/roles/update_containers/templates/update_containers.j2
+++ b/roles/update_containers/templates/update_containers.j2
@@ -130,3 +130,8 @@ spec:
     watcherApplierImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/{{ cifmw_update_containers_name_prefix }}-watcher-applier:{{ cifmw_update_containers_tag }}
     watcherDecisionEngineImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/{{ cifmw_update_containers_name_prefix }}-watcher-decision-engine:{{ cifmw_update_containers_tag }}
 {% endif %}
+{% if cifmw_update_containers_custom_images is defined and cifmw_update_containers_custom_images is mapping %}
+{% for image_name, image_uri in cifmw_update_containers_custom_images.items() %}
+    {{ image_name }}: {{ image_uri }}
+{% endfor %}
+{% endif %}