diff --git a/Makefile b/Makefile
index 6709c1f9..45f086d3 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ else
 $(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!)
 endif
 
-KUSTOMIZE_BUILD_DIR := config/secure
+KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
 
 # Disable -j flag for make
 .NOTPARALLEL:
@@ -150,12 +150,12 @@ build-push-e2e-catalog: ## Build the testdata catalog used for e2e tests and pus
 # for example: ARTIFACT_PATH=/tmp/artifacts make test-e2e
 .PHONY: test-e2e
 test-e2e: KIND_CLUSTER_NAME := operator-controller-e2e
-test-e2e: KUSTOMIZE_BUILD_DIR := config/e2e
+test-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/e2e
 test-e2e: GO_BUILD_FLAGS := -cover
 test-e2e: run image-registry build-push-e2e-catalog registry-load-bundles e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster
 
 .PHONY: extension-developer-e2e
-extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/secure
+extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
 extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e  #EXHELP Run extension-developer e2e on local kind cluster
 extension-developer-e2e: run image-registry test-ext-dev-e2e kind-clean
 
diff --git a/config/README.md b/config/README.md
index 6f0d0b43..1f801150 100644
--- a/config/README.md
+++ b/config/README.md
@@ -6,7 +6,7 @@ This provides an insecure (i.e. no TLS) basic configuration of operator-controll
 
 This configuration specifies a namespace of `olmv1-system`.
 
-## config/secure
+## config/overlays/cert-manager
 
 This includes support for a secure (i.e. with TLS) configuration of operator-controller. This configuration uses:
 * config/base
@@ -15,7 +15,7 @@ This includes support for a secure (i.e. with TLS) configuration of operator-con
 
 This configuration requires cert-manager.
 
-## config/e2e
+## config/overlays/e2e
 
 This provides additional configuration support for end-to-end testing, including code coverage. This configuration uses:
 * config/base
diff --git a/config/components/tls/patches/manager_deployment_cert.yaml b/config/components/tls/patches/manager_deployment_cert.yaml
index aea67ab8..9a1cf1b7 100644
--- a/config/components/tls/patches/manager_deployment_cert.yaml
+++ b/config/components/tls/patches/manager_deployment_cert.yaml
@@ -1,12 +1,6 @@
-- op: add
-  path: /spec/template/spec/volumes/-
-  value: {"name":"catalogd-certificate", "secret":{"secretName":"catalogd-catalogserver-cert", "optional": false, "items": [{"key": "ca.crt", "path": "catalogd.crt"}]}}
 - op: add
   path: /spec/template/spec/volumes/-
   value: {"name":"olmv1-certificate", "secret":{"secretName":"olmv1-cert", "optional": false, "items": [{"key": "ca.crt", "path": "olm-ca.crt"}]}}
-- op: add
-  path: /spec/template/spec/containers/0/volumeMounts/-
-  value: {"name":"catalogd-certificate", "readOnly": true, "mountPath":"/var/certs/catalogd.crt", "subPath":"catalogd.crt"}
 - op: add
   path: /spec/template/spec/containers/0/volumeMounts/-
   value: {"name":"olmv1-certificate", "readOnly": true, "mountPath":"/var/certs/olm-ca.crt", "subPath":"olm-ca.crt"}
diff --git a/config/secure/kustomization.yaml b/config/overlays/cert-manager/kustomization.yaml
similarity index 79%
rename from config/secure/kustomization.yaml
rename to config/overlays/cert-manager/kustomization.yaml
index 50f6ffab..86746375 100644
--- a/config/secure/kustomization.yaml
+++ b/config/overlays/cert-manager/kustomization.yaml
@@ -3,8 +3,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../base
+- ../../base
 components:
-- ../components/tls
+- ../../components/tls
 # ca must be last or tls will overwrite the namespaces
-- ../components/ca
+- ../../components/ca
diff --git a/config/e2e/kustomization.yaml b/config/overlays/e2e/kustomization.yaml
similarity index 72%
rename from config/e2e/kustomization.yaml
rename to config/overlays/e2e/kustomization.yaml
index 72e467fe..626ecb61 100644
--- a/config/e2e/kustomization.yaml
+++ b/config/overlays/e2e/kustomization.yaml
@@ -3,9 +3,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../base
+- ../../base
 components:
-- ../components/tls
-- ../components/coverage
+- ../../components/tls
+- ../../components/coverage
 # ca must be last or (tls|coverage) will overwrite the namespaces
-- ../components/ca
+- ../../components/ca