diff --git a/config/crd/bases/catalogd.operatorframework.io_catalogs.yaml b/config/base/crd/bases/catalogd.operatorframework.io_catalogs.yaml
similarity index 100%
rename from config/crd/bases/catalogd.operatorframework.io_catalogs.yaml
rename to config/base/crd/bases/catalogd.operatorframework.io_catalogs.yaml
diff --git a/config/crd/kustomization.yaml b/config/base/crd/kustomization.yaml
similarity index 100%
rename from config/crd/kustomization.yaml
rename to config/base/crd/kustomization.yaml
diff --git a/config/crd/patches/catalog_validation.yaml b/config/base/crd/patches/catalog_validation.yaml
similarity index 100%
rename from config/crd/patches/catalog_validation.yaml
rename to config/base/crd/patches/catalog_validation.yaml
diff --git a/config/default/kustomization.yaml b/config/base/default/kustomization.yaml
similarity index 96%
rename from config/default/kustomization.yaml
rename to config/base/default/kustomization.yaml
index 3415459a..1754a847 100644
--- a/config/default/kustomization.yaml
+++ b/config/base/default/kustomization.yaml
@@ -14,5 +14,4 @@ kind: Kustomization
 resources:
 - ../crd
 - ../rbac
-- ../certmanager
 - ../manager
diff --git a/config/manager/catalogserver_service.yaml b/config/base/manager/catalogserver_service.yaml
similarity index 90%
rename from config/manager/catalogserver_service.yaml
rename to config/base/manager/catalogserver_service.yaml
index 0e7e4026..872afc15 100644
--- a/config/manager/catalogserver_service.yaml
+++ b/config/base/manager/catalogserver_service.yaml
@@ -10,7 +10,7 @@ spec:
   selector:
     control-plane: controller-manager
   ports:
-  - name: https
+  - name: http
     protocol: TCP
-    port: 443
+    port: 80
     targetPort: 8083
diff --git a/config/manager/kustomization.yaml b/config/base/manager/kustomization.yaml
similarity index 100%
rename from config/manager/kustomization.yaml
rename to config/base/manager/kustomization.yaml
diff --git a/config/manager/manager.yaml b/config/base/manager/manager.yaml
similarity index 91%
rename from config/manager/manager.yaml
rename to config/base/manager/manager.yaml
index dd47a4e5..f524f250 100644
--- a/config/manager/manager.yaml
+++ b/config/base/manager/manager.yaml
@@ -76,14 +76,12 @@ spec:
         args:
         - --leader-elect
         - --metrics-bind-address=127.0.0.1:8080
-        - --https-external-address=https://catalogd-catalogserver.catalogd-system.svc
+        - --external-address=catalogd-catalogserver.catalogd-system.svc
         image: controller:latest
         name: manager
         volumeMounts:
             - name: cache
               mountPath: /var/cache/
-            - name: catalogserver-certs
-              mountPath: /var/certs/
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -112,6 +110,3 @@ spec:
       volumes:
         - name: cache
           emptyDir: {}
-        - name: catalogserver-certs
-          secret:
-            secretName: catalogd-catalogserver-cert
diff --git a/config/nginx-ingress/kustomization.yaml b/config/base/nginx-ingress/kustomization.yaml
similarity index 100%
rename from config/nginx-ingress/kustomization.yaml
rename to config/base/nginx-ingress/kustomization.yaml
diff --git a/config/nginx-ingress/resources/nginx_ingress.yaml b/config/base/nginx-ingress/resources/nginx_ingress.yaml
similarity index 100%
rename from config/nginx-ingress/resources/nginx_ingress.yaml
rename to config/base/nginx-ingress/resources/nginx_ingress.yaml
diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/config/base/rbac/auth_proxy_client_clusterrole.yaml
similarity index 100%
rename from config/rbac/auth_proxy_client_clusterrole.yaml
rename to config/base/rbac/auth_proxy_client_clusterrole.yaml
diff --git a/config/rbac/auth_proxy_role.yaml b/config/base/rbac/auth_proxy_role.yaml
similarity index 100%
rename from config/rbac/auth_proxy_role.yaml
rename to config/base/rbac/auth_proxy_role.yaml
diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/base/rbac/auth_proxy_role_binding.yaml
similarity index 100%
rename from config/rbac/auth_proxy_role_binding.yaml
rename to config/base/rbac/auth_proxy_role_binding.yaml
diff --git a/config/rbac/auth_proxy_service.yaml b/config/base/rbac/auth_proxy_service.yaml
similarity index 100%
rename from config/rbac/auth_proxy_service.yaml
rename to config/base/rbac/auth_proxy_service.yaml
diff --git a/config/rbac/kustomization.yaml b/config/base/rbac/kustomization.yaml
similarity index 100%
rename from config/rbac/kustomization.yaml
rename to config/base/rbac/kustomization.yaml
diff --git a/config/rbac/leader_election_role.yaml b/config/base/rbac/leader_election_role.yaml
similarity index 100%
rename from config/rbac/leader_election_role.yaml
rename to config/base/rbac/leader_election_role.yaml
diff --git a/config/rbac/leader_election_role_binding.yaml b/config/base/rbac/leader_election_role_binding.yaml
similarity index 100%
rename from config/rbac/leader_election_role_binding.yaml
rename to config/base/rbac/leader_election_role_binding.yaml
diff --git a/config/rbac/role.yaml b/config/base/rbac/role.yaml
similarity index 100%
rename from config/rbac/role.yaml
rename to config/base/rbac/role.yaml
diff --git a/config/rbac/role_binding.yaml b/config/base/rbac/role_binding.yaml
similarity index 100%
rename from config/rbac/role_binding.yaml
rename to config/base/rbac/role_binding.yaml
diff --git a/config/rbac/service_account.yaml b/config/base/rbac/service_account.yaml
similarity index 100%
rename from config/rbac/service_account.yaml
rename to config/base/rbac/service_account.yaml
diff --git a/config/overlays/cert-manager/kustomization.yaml b/config/overlays/cert-manager/kustomization.yaml
new file mode 100644
index 00000000..96043f51
--- /dev/null
+++ b/config/overlays/cert-manager/kustomization.yaml
@@ -0,0 +1,13 @@
+resources:
+- ../../base/default
+- resources
+
+patches:
+- target:
+    kind: Service
+    name: catalogserver
+  path: patches/catalogserver_service_port.yaml
+- target:
+    kind: Deployment
+    name: controller-manager
+  path: patches/manager_deployment_certs.yaml
\ No newline at end of file
diff --git a/config/overlays/cert-manager/patches/catalogserver_service_port.yaml b/config/overlays/cert-manager/patches/catalogserver_service_port.yaml
new file mode 100644
index 00000000..b5b88bb4
--- /dev/null
+++ b/config/overlays/cert-manager/patches/catalogserver_service_port.yaml
@@ -0,0 +1,6 @@
+- op: replace
+  path: /spec/ports/0/port
+  value: 443
+- op: replace
+  path: /spec/ports/0/name
+  value: https
\ No newline at end of file
diff --git a/config/overlays/cert-manager/patches/manager_deployment_certs.yaml b/config/overlays/cert-manager/patches/manager_deployment_certs.yaml
new file mode 100644
index 00000000..2b3143cb
--- /dev/null
+++ b/config/overlays/cert-manager/patches/manager_deployment_certs.yaml
@@ -0,0 +1,7 @@
+- op: add
+  path: /spec/template/spec/volumes/-
+  value: {"name":"catalogserver-certs", "secret":{"secretName":"catalogd-catalogserver-cert"}}
+- op: add
+  path: /spec/template/spec/containers/1/volumeMounts/-
+  value: {"name":"catalogserver-certs", "mountPath":"/var/certs"}
+
diff --git a/config/certmanager/certificate.yaml b/config/overlays/cert-manager/resources/certificate.yaml
similarity index 87%
rename from config/certmanager/certificate.yaml
rename to config/overlays/cert-manager/resources/certificate.yaml
index 65d60555..c0e124c6 100644
--- a/config/certmanager/certificate.yaml
+++ b/config/overlays/cert-manager/resources/certificate.yaml
@@ -14,6 +14,6 @@ spec:
   dnsNames:
     - catalogd-catalogserver.catalogd-system.svc
   issuerRef:
-    name: catalogd-catalogserver-selfsigned-issuer
+    name: catalogserver-selfsigned-issuer
     kind: Issuer
 
diff --git a/config/certmanager/issuer.yaml b/config/overlays/cert-manager/resources/issuer.yaml
similarity index 100%
rename from config/certmanager/issuer.yaml
rename to config/overlays/cert-manager/resources/issuer.yaml
diff --git a/config/certmanager/kustomization.yaml b/config/overlays/cert-manager/resources/kustomization.yaml
similarity index 68%
rename from config/certmanager/kustomization.yaml
rename to config/overlays/cert-manager/resources/kustomization.yaml
index b5142199..be2bcf4c 100644
--- a/config/certmanager/kustomization.yaml
+++ b/config/overlays/cert-manager/resources/kustomization.yaml
@@ -1,3 +1,3 @@
 resources:
-- issuer.yaml
 - certificate.yaml
+- issuer.yaml
\ No newline at end of file