diff --git a/roles/edpm_prepare/tasks/kustomize_and_deploy.yml b/roles/edpm_prepare/tasks/kustomize_and_deploy.yml
index 3267e4dee..f0e907917 100644
--- a/roles/edpm_prepare/tasks/kustomize_and_deploy.yml
+++ b/roles/edpm_prepare/tasks/kustomize_and_deploy.yml
@@ -38,7 +38,8 @@
       (cifmw_update_containers_openstack is defined and
       cifmw_update_containers_openstack | bool) or
       (cifmw_update_containers_watcher is defined and
-      cifmw_update_containers_watcher | bool))
+      cifmw_update_containers_watcher | bool) or
+      cifmw_update_containers_bgptests is defined)
   vars:
     cifmw_update_containers_metadata: "{{ _ctlplane_name }}"
   ansible.builtin.include_role:
diff --git a/roles/update_containers/templates/update_containers.j2 b/roles/update_containers/templates/update_containers.j2
index ff71612ce..04e8c3690 100644
--- a/roles/update_containers/templates/update_containers.j2
+++ b/roles/update_containers/templates/update_containers.j2
@@ -124,3 +124,12 @@ 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_bgptests is defined  %}
+    ansibleeeImage: quay.io/eolivare/openstack-ansibleee-runner:OSPRH-22480-main
+    neutronAPIImage: {{ cifmw_update_containers_bgptests.image_repo }}/openstack-neutron-server:{{ cifmw_update_containers_bgptests.neutron_server_tag }}
+    ovnControllerImage: {{ cifmw_update_containers_bgptests.image_repo }}/openstack-ovn-controller-rhel9:{{ cifmw_update_containers_bgptests.ovn_controller_tag }}
+    ovnSbDbclusterImage: {{ cifmw_update_containers_bgptests.image_repo }}/openstack-ovn-sb-db-server-rhel9:{{ cifmw_update_containers_bgptests.sb_db_tag }}
+    ovnNbDbclusterImage: {{ cifmw_update_containers_bgptests.image_repo }}/openstack-ovn-nb-db-server-rhel9:{{ cifmw_update_containers_bgptests.nb_db_tag }}
+    ovnNorthdImage: {{ cifmw_update_containers_bgptests.image_repo }}/openstack-ovn-northd-rhel9:{{ cifmw_update_containers_bgptests.northd_tag }}
+    {# edpmNeutronOvnAgentImage: {{ cifmw_update_containers_bgptests.image_repo }}/openstack-neutron-ovn-agent-rhel9:{{ cifmw_update_containers_bgptests.ovn_agent_tag }} #}
+{% endif %}