diff --git a/Makefile b/Makefile
index 8280e8b8..d2a3abe2 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ 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/base/e2e
+test-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/e2e
 test-e2e: GO_BUILD_FLAGS := -cover
 test-e2e: run image-registry build-push-e2e-catalog kind-load-test-artifacts e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster
 
diff --git a/config/base/e2e/kustomization.yaml b/config/overlays/e2e/kustomization.yaml
similarity index 100%
rename from config/base/e2e/kustomization.yaml
rename to config/overlays/e2e/kustomization.yaml
diff --git a/config/base/e2e/manager_e2e_coverage_copy_pod.yaml b/config/overlays/e2e/manager_e2e_coverage_copy_pod.yaml
similarity index 100%
rename from config/base/e2e/manager_e2e_coverage_copy_pod.yaml
rename to config/overlays/e2e/manager_e2e_coverage_copy_pod.yaml
diff --git a/config/base/e2e/manager_e2e_coverage_patch.yaml b/config/overlays/e2e/manager_e2e_coverage_patch.yaml
similarity index 100%
rename from config/base/e2e/manager_e2e_coverage_patch.yaml
rename to config/overlays/e2e/manager_e2e_coverage_patch.yaml
diff --git a/config/base/e2e/manager_e2e_coverage_pvc.yaml b/config/overlays/e2e/manager_e2e_coverage_pvc.yaml
similarity index 100%
rename from config/base/e2e/manager_e2e_coverage_pvc.yaml
rename to config/overlays/e2e/manager_e2e_coverage_pvc.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
deleted file mode 100644
index d1016c6c..00000000
--- a/config/rbac/role.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: manager-role
-rules:
-- apiGroups:
-  - '*'
-  resources:
-  - '*'
-  verbs:
-  - '*'
-- apiGroups:
-  - catalogd.operatorframework.io
-  resources:
-  - catalogmetadata
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - catalogd.operatorframework.io
-  resources:
-  - clustercatalogs
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - create
-  - delete
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - pods/log
-  verbs:
-  - get
-- apiGroups:
-  - olm.operatorframework.io
-  resources:
-  - clusterextensions
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - olm.operatorframework.io
-  resources:
-  - clusterextensions/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - olm.operatorframework.io
-  resources:
-  - clusterextensions/status
-  verbs:
-  - patch
-  - update