diff --git a/zuul.d/job.yaml b/zuul.d/job.yaml
index aad90bdf..c6d96abb 100644
--- a/zuul.d/job.yaml
+++ b/zuul.d/job.yaml
@@ -5,7 +5,7 @@
     nodeset: centos-stream-9-vexxhost
     vars:
       cifmw_build_containers_registry_namespace: podified-antelope-centos9
-      cifmw_build_containers_install_from_source: true
+      cifmw_build_containers_image_tag: "{{ cifmw_repo_setup_full_hash }}"
     irrelevant-files: &if
       - HACKING.rst
       - AUTHORS
@@ -26,20 +26,19 @@
     parent: podified-multinode-edpm-deployment-crc
     irrelevant-files: *if
     vars: &edpm_vars
-      cifmw_edpm_prepare_update_os_containers: true
-      cifmw_set_openstack_containers_edpm: true
-      cifmw_set_openstack_containers_registry: "{{ content_provider_registry_ip }}:5001"
-      cifmw_set_openstack_containers_tag_from_md5: true
-      cifmw_set_openstack_containers_dlrn_md5_path: "~/ci-framework-data/artifacts/repositories/delorean.repo.md5"
+      cifmw_update_containers_registry: "{{ content_provider_registry_ip }}:5001"
+      cifmw_update_containers_org: "podified-antelope-centos9"
+      cifmw_update_containers_tag: "{{ content_provider_dlrn_md5_hash }}"
+      cifmw_update_containers_openstack: true
       cifmw_run_test_role: test_operator
       cifmw_run_tempest: true
       cifmw_test_operator_tempest_registry: "{{ content_provider_registry_ip }}:5001"
-      cifmw_test_operator_tempest_image_tag: "{{ cifmw_repo_setup_full_hash }}"
+      cifmw_test_operator_tempest_image_tag: "{{ content_provider_dlrn_md5_hash }}"
       cifmw_test_operator_tempest_include_list: |
         tempest.scenario.test_network_basic_ops.TestNetworkBasicOps
       cifmw_run_tobiko: true
       cifmw_test_operator_tobiko_registry: "{{ content_provider_registry_ip }}:5001"
-      cifmw_test_operator_tobiko_image_tag: "{{ cifmw_repo_setup_full_hash }}"
+      cifmw_test_operator_tobiko_image_tag: "{{ content_provider_dlrn_md5_hash }}"
       cifmw_test_operator_tobiko_testenv: "sanity"
 
 - job: