diff --git a/.zuul.yaml b/.zuul.yaml
index d18caf34..309c13e5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,6 @@
     merge-mode: rebase
     templates:
       - opendev-master-watcher-operator-pipeline
-      - opendev-epoxy-watcher-operator-pipeline
     github-check:
       jobs:
         - noop
diff --git a/ci/scenarios/edpm.yml b/ci/scenarios/edpm.yml
index 90222d31..55477f97 100644
--- a/ci/scenarios/edpm.yml
+++ b/ci/scenarios/edpm.yml
@@ -167,17 +167,6 @@ cifmw_edpm_prepare_kustomizations:
         target:
           kind: OpenStackControlPlane
 
-      - patch: |-
-          apiVersion: core.openstack.org/v1beta1
-          kind: OpenStackControlPlane
-          metadata:
-            name: controlplane
-          spec:
-            barbican:
-              enabled: false
-        target:
-          kind: OpenStackControlPlane
-
 cifmw_edpm_prepare_timeout: 60
 
 cifmw_install_yamls_whitelisted_vars: