diff --git a/ci-operator/config/openshift/oc/openshift-oc-master.yaml b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
index ce78bc5b06853..2bf760fe2dad4 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-master.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  must-gather-base:
-    name: "4.16"
-    namespace: ocp
-    tag: must-gather
   ocp_4.16_base:
     name: "4.16"
     namespace: ocp
@@ -69,16 +65,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: tests
-- dockerfile_path: images/cli/Dockerfile.rhel
-  from: must-gather-base
-  inputs:
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
-    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
-  to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
   from: cli
@@ -103,7 +89,6 @@ promotion:
       oc-rpms: rpms
     excluded_images:
     - tests
-    - must-gather
     - oc-base-with-rpms
     name: "4.16"
     namespace: ocp
diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
index 21c7f880a43c1..e7a282fe50939 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  must-gather-base:
-    name: "4.16"
-    namespace: ocp
-    tag: must-gather
   ocp_4.16_base:
     name: "4.16"
     namespace: ocp
@@ -69,16 +65,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: tests
-- dockerfile_path: images/cli/Dockerfile.rhel
-  from: must-gather-base
-  inputs:
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
-    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
-  to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
   from: cli
@@ -104,7 +90,6 @@ promotion:
     disabled: true
     excluded_images:
     - tests
-    - must-gather
     - oc-base-with-rpms
     name: "4.16"
     namespace: ocp
diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml
index 5e5950527b148..3be27de529a6a 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  must-gather-base:
-    name: "4.17"
-    namespace: ocp
-    tag: must-gather
   ocp_4.16_base:
     name: "4.17"
     namespace: ocp
@@ -69,16 +65,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: tests
-- dockerfile_path: images/cli/Dockerfile.rhel
-  from: must-gather-base
-  inputs:
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
-    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
-  to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
   from: cli
@@ -103,7 +89,6 @@ promotion:
       oc-rpms: rpms
     excluded_images:
     - tests
-    - must-gather
     - oc-base-with-rpms
     name: "4.17"
     namespace: ocp