diff --git a/hack/config/cert-manager/kustomization.yaml b/hack/config/cert-manager/kustomization.yaml
index af9b0749..6ed4839d 100644
--- a/hack/config/cert-manager/kustomization.yaml
+++ b/hack/config/cert-manager/kustomization.yaml
@@ -3,4 +3,3 @@ kind: Kustomization
 
 resources:
 - https://github.com/cert-manager/cert-manager/releases/download/v1.12.2/cert-manager.yaml
-- cluster-issuer.yaml
diff --git a/hack/config/cert-manager/cluster-issuer.yaml b/hack/config/cert-manager/resources/cluster-issuer.yaml
similarity index 90%
rename from hack/config/cert-manager/cluster-issuer.yaml
rename to hack/config/cert-manager/resources/cluster-issuer.yaml
index 787a1007..561301b2 100644
--- a/hack/config/cert-manager/cluster-issuer.yaml
+++ b/hack/config/cert-manager/resources/cluster-issuer.yaml
@@ -4,7 +4,7 @@ metadata:
   name: letsencrypt-http01
 spec:
   acme:
-    email: timebertt@gmail.com
+    email: null@timebertt.dev
     server: https://acme-v02.api.letsencrypt.org/directory
     privateKeySecretRef:
       name: http01-timebertt-dev
diff --git a/hack/config/cert-manager/resources/kustomization.yaml b/hack/config/cert-manager/resources/kustomization.yaml
new file mode 100644
index 00000000..ca45c340
--- /dev/null
+++ b/hack/config/cert-manager/resources/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- cluster-issuer.yaml
diff --git a/hack/config/skaffold.yaml b/hack/config/skaffold.yaml
index c7cc4295..08a5e83f 100644
--- a/hack/config/skaffold.yaml
+++ b/hack/config/skaffold.yaml
@@ -1,6 +1,38 @@
 ---
 apiVersion: skaffold/v4beta6
 kind: Config
+metadata:
+  name: cert-manager
+manifests:
+  kustomize:
+    paths:
+    - hack/config/cert-manager
+deploy:
+  kubectl:
+    defaultNamespace: ""
+    flags:
+      apply:
+      - --server-side
+      - --force-conflicts
+---
+apiVersion: skaffold/v4beta6
+kind: Config
+metadata:
+  name: cert-manager-resources
+manifests:
+  kustomize:
+    paths:
+    - hack/config/cert-manager/resources
+deploy:
+  kubectl:
+    defaultNamespace: ""
+    flags:
+      apply:
+      - --server-side
+      - --force-conflicts
+---
+apiVersion: skaffold/v4beta6
+kind: Config
 metadata:
   name: ingress-nginx
 manifests:
diff --git a/webhosting-operator/README.md b/webhosting-operator/README.md
index a24a4906..9770ee2d 100644
--- a/webhosting-operator/README.md
+++ b/webhosting-operator/README.md
@@ -81,9 +81,6 @@ k apply -f shoot.yaml
 # deploy external-dns for managing a DNS record for our webhosting service
 k apply --server-side -k config/external-dns
 k -n external-dns create secret generic google-clouddns-timebertt-dev --from-literal project=$PROJECT_NAME --from-file service-account.json=$SERVICE_ACCOUNT_FILE
-
-# deploy cert-manager for managing TLS certificates
-k apply --server-side -k config/cert-manager
 ```
 
 ### 2. Deploy the Operator