diff --git a/clusters/cl01tl/manifests/freshrss/freshrss.yaml b/clusters/cl01tl/manifests/freshrss/freshrss.yaml
index 6741009cf..b6b92a319 100644
--- a/clusters/cl01tl/manifests/freshrss/freshrss.yaml
+++ b/clusters/cl01tl/manifests/freshrss/freshrss.yaml
@@ -3,27 +3,6 @@
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
-metadata:
-  name: freshrss-extensions
-  labels:
-    app.kubernetes.io/instance: freshrss
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: freshrss
-    helm.sh/chart: freshrss-4.4.0
-  annotations:
-    helm.sh/resource-policy: keep
-  namespace: freshrss
-spec:
-  accessModes:
-    - "ReadWriteOnce"
-  resources:
-    requests:
-      storage: "1Gi"
-  storageClassName: "ceph-block"
----
-# Source: freshrss/charts/freshrss/templates/common.yaml
-kind: PersistentVolumeClaim
-apiVersion: v1
 metadata:
   name: freshrss-data
   labels:
@@ -43,6 +22,27 @@ spec:
   storageClassName: "ceph-block"
 ---
 # Source: freshrss/charts/freshrss/templates/common.yaml
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: freshrss-extensions
+  labels:
+    app.kubernetes.io/instance: freshrss
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: freshrss
+    helm.sh/chart: freshrss-4.4.0
+  annotations:
+    helm.sh/resource-policy: keep
+  namespace: freshrss
+spec:
+  accessModes:
+    - "ReadWriteOnce"
+  resources:
+    requests:
+      storage: "1Gi"
+  storageClassName: "ceph-block"
+---
+# Source: freshrss/charts/freshrss/templates/common.yaml
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/clusters/cl01tl/manifests/searxng/searxng.yaml b/clusters/cl01tl/manifests/searxng/searxng.yaml
index 94b95ca8e..e8d574a0d 100644
--- a/clusters/cl01tl/manifests/searxng/searxng.yaml
+++ b/clusters/cl01tl/manifests/searxng/searxng.yaml
@@ -41,30 +41,6 @@ spec:
 # Source: searxng/charts/searxng/templates/common.yaml
 apiVersion: v1
 kind: Service
-metadata:
-  name: searxng-api
-  labels:
-    app.kubernetes.io/instance: searxng
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: searxng
-    app.kubernetes.io/service: searxng-api
-    helm.sh/chart: searxng-4.4.0
-  namespace: searxng
-spec:
-  type: ClusterIP
-  ports:
-    - port: 8080
-      targetPort: 8080
-      protocol: TCP
-      name: mail
-  selector:
-    app.kubernetes.io/controller: api
-    app.kubernetes.io/instance: searxng
-    app.kubernetes.io/name: searxng
----
-# Source: searxng/charts/searxng/templates/common.yaml
-apiVersion: v1
-kind: Service
 metadata:
   name: searxng-browser
   labels:
@@ -87,6 +63,30 @@ spec:
     app.kubernetes.io/name: searxng
 ---
 # Source: searxng/charts/searxng/templates/common.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: searxng-api
+  labels:
+    app.kubernetes.io/instance: searxng
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: searxng
+    app.kubernetes.io/service: searxng-api
+    helm.sh/chart: searxng-4.4.0
+  namespace: searxng
+spec:
+  type: ClusterIP
+  ports:
+    - port: 8080
+      targetPort: 8080
+      protocol: TCP
+      name: mail
+  selector:
+    app.kubernetes.io/controller: api
+    app.kubernetes.io/instance: searxng
+    app.kubernetes.io/name: searxng
+---
+# Source: searxng/charts/searxng/templates/common.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/clusters/cl01tl/manifests/stack/stack.yaml b/clusters/cl01tl/manifests/stack/stack.yaml
new file mode 100644
index 000000000..e72fa33ad
--- /dev/null
+++ b/clusters/cl01tl/manifests/stack/stack.yaml
@@ -0,0 +1,120 @@
+---
+# Source: stack/templates/application.yaml
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: stack-cl01tl
+  namespace: argocd
+  labels:
+    app.kubernetes.io/name: stack-cl01tl
+    app.kubernetes.io/instance: argocd
+    app.kubernetes.io/part-of: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure
+    targetRevision: HEAD
+    path: clusters/cl01tl/manifests/stack
+  destination:
+    name: in-cluster
+    namespace: argocd
+  revisionHistoryLimit: 3
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: false
+    retry:
+      limit: 3
+      backoff:
+        duration: 1m
+        factor: 2
+        maxDuration: 15m
+    syncOptions:
+      - CreateNamespace=false
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - PruneLast=true
+      - RespectIgnoreDifferences=true
+---
+# Source: stack/templates/application-set.yaml
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: application-set-cl01tl
+  namespace: argocd
+  labels:
+    app.kubernetes.io/name: application-set-cl01tl
+    app.kubernetes.io/instance: argocd
+    app.kubernetes.io/part-of: argocd
+spec:
+  syncPolicy:
+    applicationsSync: create-update
+    preserveResourcesOnDeletion: true
+  generators:
+    - git:
+        repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure
+        revision: HEAD
+        directories:
+          - path: clusters/cl01tl/manifests/*
+          - path: clusters/cl01tl/manifests/stack
+            exclude: true
+  template:
+    metadata:
+      name: '{{path.basename}}'
+    spec:
+      project: default
+      source:
+        repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure
+        targetRevision: HEAD
+        path: '{{.path.path}}'
+        helm:
+          releaseName: '{{path.basename}}'
+      destination:
+        name: in-cluster
+        namespace: '{{path.basename}}'
+      revisionHistoryLimit: 3
+      ignoreDifferences:
+        - group: ""
+          kind: Service
+          jqPathExpressions:
+            - .spec.externalName
+        - group: "apps"
+          kind: "Deployment"
+          jsonPointers:
+            - /spec/template/metadata/annotations/checksum~1secret
+            - /spec/template/metadata/annotations/checksum~1secret-core
+            - /spec/template/metadata/annotations/checksum~1secret-jobservice
+            - /spec/template/metadata/annotations/checksum~1tls
+        - group: "apps"
+          kind: "StatefulSet"
+          jsonPointers:
+            - /spec/template/metadata/annotations/checksum~1secret
+            - /spec/template/metadata/annotations/checksum~1tls
+        - group: "apps"
+          kind: StatefulSet
+          jqPathExpressions:
+            - .spec.volumeClaimTemplates[]?.apiVersion
+            - .spec.volumeClaimTemplates[]?.kind
+            - .spec.volumeClaimTemplates[]?.metadata.creationTimestamp
+        - group: ""
+          kind: GpuDevicePlugin
+          jqPathExpressions:
+            - .metadata.annotations[]
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: false
+        retry:
+          limit: 3
+          backoff:
+            duration: 1m
+            factor: 2
+            maxDuration: 15m
+        syncOptions:
+          - CreateNamespace=true
+          - ApplyOutOfSyncOnly=true
+          - ServerSideApply=true
+          - PruneLast=true
+          - RespectIgnoreDifferences=true
diff --git a/clusters/cl01tl/manifests/tdarr/tdarr.yaml b/clusters/cl01tl/manifests/tdarr/tdarr.yaml
index 56f2f8bb3..4da17a419 100644
--- a/clusters/cl01tl/manifests/tdarr/tdarr.yaml
+++ b/clusters/cl01tl/manifests/tdarr/tdarr.yaml
@@ -29,7 +29,7 @@ spec:
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: tdarr-server
+  name: tdarr-config
   labels:
     app.kubernetes.io/instance: tdarr
     app.kubernetes.io/managed-by: Helm
@@ -50,7 +50,7 @@ spec:
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: tdarr-config
+  name: tdarr-server
   labels:
     app.kubernetes.io/instance: tdarr
     app.kubernetes.io/managed-by: Helm