diff --git a/ci/openstack-versions-kustomization.yaml.j2 b/ci/openstack-versions-kustomization.yaml.j2
new file mode 100644
index 00000000..6b2bf4bb
--- /dev/null
+++ b/ci/openstack-versions-kustomization.yaml.j2
@@ -0,0 +1,25 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openstack
+patches:
+  - patch: |-
+      apiVersion: core.openstack.org/v1beta1
+      kind: OpenStackVersion
+      metadata:
+        name: unused
+      spec:
+        customContainerImages:
+          aodhAPIImage: {{ telemetry_registry }}/openstack-aodh-api:{{ telemetry_tag }}
+          aodhEvaluatorImage: {{ telemetry_registry }}/openstack-aodh-evaluator:{{ telemetry_tag }}
+          aodhListenerImage: {{ telemetry_registry }}/openstack-aodh-listener:{{ telemetry_tag }}
+          aodhNotifierImage: {{ telemetry_registry }}/openstack-aodh-notifier:{{ telemetry_tag }}
+          ceilometerCentralImage: {{ telemetry_registry }}/openstack-ceilometer-central:{{ telemetry_tag }}
+          ceilometerComputeImage: {{ telemetry_registry }}/openstack-ceilometer-compute:{{ telemetry_tag }}
+          cloudkittyAPIImage: {{ telemetry_registry }}/openstack-cloudkitty-api:{{ telemetry_tag }}
+          cloudkittyProcImage: {{ telemetry_registry }}/openstack-cloudkitty-processor:{{ telemetry_tag }}
+          heatAPIImage: {{ telemetry_registry }}/openstack-heat-api:{{ telemetry_tag }}
+          heatCfnapiImage: {{ telemetry_registry }}/openstack-heat-api-cfn:{{ telemetry_tag }}
+          heatEngineImage: {{ telemetry_registry }}/openstack-heat-engine:{{ telemetry_tag }}
+    target:
+      kind: OpenStackVersion
+
diff --git a/ci/use-master-containers.yml b/ci/use-master-containers.yml
index 5dc32cb7..01d0e4cf 100644
--- a/ci/use-master-containers.yml
+++ b/ci/use-master-containers.yml
@@ -8,21 +8,26 @@
     - vars/common.yml
     - vars/osp18_env.yml
   tasks:
-    - name: Make sure logs directory exists
-      ansible.builtin.file:
-        path: "{{ logs_dir }}"
-        state: directory
-        recurse: true
+    #    - name: Make sure logs directory exists
+    #      ansible.builtin.file:
+    #        path: "{{ logs_dir }}"
+    #        state: directory
+    #        recurse: true
+    #
+    # - name: Generate container update template file
+    #   ansible.builtin.template:
+    #     src: "patch-openstack-versions.yaml.j2"
+    #     dest: "{{ logs_dir }}/patch-openstack-versions.yaml"
+    # - name: Patch the openstackversions to use the master containers for aodh, heat and ceilometer
+    #   ansible.builtin.shell:
+    #     cmd: |
+    #       oc patch openstackversions controlplane --type merge --patch-file {{ logs_dir }}/patch-openstack-versions.yaml
+    #     chdir: "{{ fvt_dir }}"
+    #   tags:
+    #     - setup
 
-    - name: Generate container update template file
-      ansible.builtin.template:
-        src: "patch-openstack-versions.yaml.j2"
-        dest: "{{ logs_dir }}/patch-openstack-versions.yaml"
-    - name: Patch the openstackversions to use the master containers for aodh, heat and ceilometer
-      ansible.builtin.shell:
-        cmd: |
-          oc patch openstackversions controlplane --type merge --patch-file {{ logs_dir }}/patch-openstack-versions.yaml
-        chdir: "{{ fvt_dir }}"
-      tags:
-        - setup
+     - name: Render the kustomization
+       ansible.builtin.template:
+         src: "openstack-versions-kustomization.yaml.j2"
+         dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/openstackversions-use-master-containers.yaml"
 
diff --git a/ci/vars-use-master-containers.yml b/ci/vars-use-master-containers.yml
index ba07741f..1a9a2063 100644
--- a/ci/vars-use-master-containers.yml
+++ b/ci/vars-use-master-containers.yml
@@ -1,4 +1,4 @@
 ---
-post_ctlplane_deploy_99_modify_openstackversions:
+pre_deploy_kustomize_openstackversions:
   source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/use-master-containers.yml"
   type: playbook