diff --git a/kubernetes/apps/cert-manager-old/cert-manager.yaml b/kubernetes/apps/cert-manager-old/cert-manager.yaml
new file mode 100644
index 0000000..ed80b93
--- /dev/null
+++ b/kubernetes/apps/cert-manager-old/cert-manager.yaml
@@ -0,0 +1,65 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: cert-manager-secrets
+  namespace: flux-system
+spec:
+  suspend: true
+  interval: 1h
+  path: ./cert-manager
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: home-cluster-ops-secrets
+  dependsOn:
+    - name: repositories
+      namespace: flux-system
+    - name: cert-manager
+      namespace: flux-system
+  decryption:
+    provider: sops
+    secretRef:
+      name: sops-age
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: cert-manager
+  namespace: flux-system
+spec:
+  suspend: true
+  interval: 1h
+  targetNamespace: cert-manager
+  path: ./kubernetes/templates/apps/cert-manager/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: flux-system
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: cert-manager-secrets
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: cert-manager-issuers
+  namespace: flux-system
+spec:
+  suspend: true
+  interval: 1h
+  targetNamespace: cert-manager
+  path: ./kubernetes/templates/apps/cert-manager/issuers
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: flux-system
+  dependsOn:
+    - name: cert-manager-secrets
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: cert-manager-secrets
diff --git a/kubernetes/apps/cert-manager-old/kustomization.yaml b/kubernetes/apps/cert-manager-old/kustomization.yaml
new file mode 100644
index 0000000..859702d
--- /dev/null
+++ b/kubernetes/apps/cert-manager-old/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - cert-manager.yaml
diff --git a/kubernetes/apps/cert-manager/cert-manager.yaml b/kubernetes/apps/cert-manager/cert-manager.yaml
index ed80b93..08b7ab6 100644
--- a/kubernetes/apps/cert-manager/cert-manager.yaml
+++ b/kubernetes/apps/cert-manager/cert-manager.yaml
@@ -1,65 +1,14 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
-metadata:
-  name: cert-manager-secrets
-  namespace: flux-system
-spec:
-  suspend: true
-  interval: 1h
-  path: ./cert-manager
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    namespace: flux-system
-    name: home-cluster-ops-secrets
-  dependsOn:
-    - name: repositories
-      namespace: flux-system
-    - name: cert-manager
-      namespace: flux-system
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-age
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
 metadata:
   name: cert-manager
   namespace: flux-system
 spec:
-  suspend: true
   interval: 1h
   targetNamespace: cert-manager
-  path: ./kubernetes/templates/apps/cert-manager/app
+  path: ./kubernetes/templates/apps/cert-manager
   prune: true
   sourceRef:
     kind: GitRepository
     namespace: flux-system
-    name: flux-system
-  postBuild:
-    substituteFrom:
-      - kind: Secret
-        name: cert-manager-secrets
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: cert-manager-issuers
-  namespace: flux-system
-spec:
-  suspend: true
-  interval: 1h
-  targetNamespace: cert-manager
-  path: ./kubernetes/templates/apps/cert-manager/issuers
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    namespace: flux-system
-    name: flux-system
-  dependsOn:
-    - name: cert-manager-secrets
-  postBuild:
-    substituteFrom:
-      - kind: Secret
-        name: cert-manager-secrets
+    name: flux-system
\ No newline at end of file
diff --git a/kubernetes/apps/cert-manager/release.yaml b/kubernetes/apps/cert-manager/release.yaml
new file mode 100644
index 0000000..e0c8f52
--- /dev/null
+++ b/kubernetes/apps/cert-manager/release.yaml
@@ -0,0 +1,35 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cert-manager
+  namespace: cert-manager
+spec:
+  releaseName: cert-manager
+  chart:
+    spec:
+      chart: cert-manager
+      sourceRef:
+        kind: HelmRepository
+        name: truecharts
+        namespace: flux-system
+  interval: 5m
+  install:
+    remediation:
+      retries: 3
+  values:
+    service:
+      main:
+        enabled: true
+        ports:
+          main:
+            enabled: true
+    workload:
+      main:
+        enabled: true
+    portal:
+      open:
+        enabled: true
+    certmanager:
+      prometheus:
+        servicemonitor:
+          enabled: false
\ No newline at end of file