diff --git a/clusters/testing/kustomization.yaml b/clusters/testing/kustomization.yaml
index a77d6ab..d7a665b 100644
--- a/clusters/testing/kustomization.yaml
+++ b/clusters/testing/kustomization.yaml
@@ -6,4 +6,4 @@ resources:
   - ../../controllers/cert-manager/cert-manager.yaml
   - ../../configs/artifacts.yaml
   - ../../configs/letsencrypt/letsencrypt.yaml
-  - ../../configs/certificates/staging/certificates.yaml
+  - ../../configs/certificates/certificates.yaml
diff --git a/configs/certificates/base/certificate-huizinga-dev.yaml b/configs/certificates/base/certificate-huizinga-dev.yaml
new file mode 100644
index 0000000..810058f
--- /dev/null
+++ b/configs/certificates/base/certificate-huizinga-dev.yaml
@@ -0,0 +1,10 @@
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: huizinga-dev
+  namespace: certificates
+spec:
+  secretName: huizinga-dev-tls
+  issuerRef:
+    name: letsencrypt
+    kind: ClusterIssuer
diff --git a/configs/certificates/base/kustomization.yaml b/configs/certificates/base/kustomization.yaml
new file mode 100644
index 0000000..632af6a
--- /dev/null
+++ b/configs/certificates/base/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - namespace.yaml
+  - certificate-huizinga-dev.yaml
diff --git a/configs/certificates/namespace.yaml b/configs/certificates/base/namespace.yaml
similarity index 100%
rename from configs/certificates/namespace.yaml
rename to configs/certificates/base/namespace.yaml
diff --git a/configs/certificates/production/certificates.yaml b/configs/certificates/certificates.yaml
similarity index 92%
rename from configs/certificates/production/certificates.yaml
rename to configs/certificates/certificates.yaml
index daf4c27..dc9f075 100644
--- a/configs/certificates/production/certificates.yaml
+++ b/configs/certificates/certificates.yaml
@@ -12,6 +12,6 @@ spec:
   sourceRef:
     kind: ExternalArtifact
     name: certificates
-  path: ./production
+  path: ./${cluster_env}
   prune: true
   wait: true
diff --git a/configs/certificates/production/certificate-huizinga-dev.yaml b/configs/certificates/production/certificate-huizinga-dev.yaml
index 2e68b59..ca10c5d 100644
--- a/configs/certificates/production/certificate-huizinga-dev.yaml
+++ b/configs/certificates/production/certificate-huizinga-dev.yaml
@@ -4,10 +4,6 @@ metadata:
   name: huizinga-dev
   namespace: certificates
 spec:
-  secretName: huizinga-dev-tls
-  issuerRef:
-    name: letsencrypt
-    kind: ClusterIssuer
   commonName: "huizinga.dev"
   dnsNames:
     - "huizinga.dev"
diff --git a/configs/certificates/production/kustomization.yaml b/configs/certificates/production/kustomization.yaml
index 5f037e5..a1a7991 100644
--- a/configs/certificates/production/kustomization.yaml
+++ b/configs/certificates/production/kustomization.yaml
@@ -1,5 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../namespace.yaml
-  - certificate-huizinga-dev.yaml
+  - ../base
+patches:
+  - path: certificate-huizinga-dev.yaml
+    target:
+      kind: Certificate
diff --git a/configs/certificates/staging/certificate-huizinga-dev.yaml b/configs/certificates/staging/certificate-huizinga-dev.yaml
index e82e639..547fd08 100644
--- a/configs/certificates/staging/certificate-huizinga-dev.yaml
+++ b/configs/certificates/staging/certificate-huizinga-dev.yaml
@@ -4,10 +4,6 @@ metadata:
   name: huizinga-dev
   namespace: certificates
 spec:
-  secretName: huizinga-dev-tls
-  issuerRef:
-    name: letsencrypt
-    kind: ClusterIssuer
   commonName: "staging.huizinga.dev"
   dnsNames:
     - "staging.huizinga.dev"
diff --git a/configs/certificates/staging/certificates.yaml b/configs/certificates/staging/certificates.yaml
deleted file mode 100644
index 4048480..0000000
--- a/configs/certificates/staging/certificates.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: certificates
-  namespace: flux-system
-spec:
-  interval: 1h
-  retryInterval: 2m
-  timeout: 5m
-  dependsOn:
-    - name: letsencrypt
-  sourceRef:
-    kind: ExternalArtifact
-    name: certificates
-  path: ./staging
-  prune: true
-  wait: true
diff --git a/configs/certificates/staging/kustomization.yaml b/configs/certificates/staging/kustomization.yaml
index 5f037e5..a1a7991 100644
--- a/configs/certificates/staging/kustomization.yaml
+++ b/configs/certificates/staging/kustomization.yaml
@@ -1,5 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../namespace.yaml
-  - certificate-huizinga-dev.yaml
+  - ../base
+patches:
+  - path: certificate-huizinga-dev.yaml
+    target:
+      kind: Certificate