diff --git a/applications/20-databases/mariadb-operators/mariadb-operators.yaml b/applications/20-databases/mariadb-operators/mariadb-operators.yaml
index 51ba483..ffcae64 100644
--- a/applications/20-databases/mariadb-operators/mariadb-operators.yaml
+++ b/applications/20-databases/mariadb-operators/mariadb-operators.yaml
@@ -1,53 +1,32 @@
 ---
 apiVersion: argoproj.io/v1alpha1
-kind: Application
+kind: ApplicationSet
 metadata:
-  name: mariadb-operator-crds
+  name: home-server-mariadb
   namespace: argocd
 spec:
-  project: default
-  source:
-    repoURL: "https://charts.mariadb.com/mariadb-operator"
-    chart: "mariadb-operator-crds"
-    targetRevision: "0.38.1"
-    helm:
-      releaseName: "mariadb-operator-crds"
-  destination:
-    server: "https://kubernetes.default.svc"
-    namespace: database
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-      - ApplyOutOfSyncOnly=true
-      - SkipHooks=false
-      - SyncWave=0  # ensure this is applied first
-
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: mariadb-operator
-  namespace: argocd
-spec:
-  project: default
-  source:
-    repoURL: "https://charts.mariadb.com/mariadb-operator"
-    chart: "mariadb-operator"
-    targetRevision: "0.38.1"
-    helm:
-      releaseName: "mariadb-operator"
-  destination:
-    server: "https://kubernetes.default.svc"
-    namespace: database
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-      - ApplyOutOfSyncOnly=true
-      - SkipHooks=false
-      - SyncWave=1  # ensure this waits for mariadb-operator-crds
+  generators:
+    - list:
+        elements:
+          - name: mariadb-operator
+            path: deploy
+            namespace: database
+  goTemplate: true
+  template:
+    metadata:
+      name: "{{.name}}"
+    spec:
+      project: default
+      source:
+        repoURL: https://github.com/mariadb-operator/mariadb-operator.git
+        targetRevision: main
+        path: "{{.path}}"
+      destination:
+        server: https://kubernetes.default.svc
+        namespace: '{{.namespace"}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true