diff --git a/cluster/external-secrets-appset.yaml b/cluster/external-secrets-appset.yaml
deleted file mode 100644
index 5a40088..0000000
--- a/cluster/external-secrets-appset.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: external-secrets-operator
-  namespace: openshift-gitops
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  goTemplate: true
-  goTemplateOptions: ["missingkey=error"]
-  generators:
-  - clusters: {} # Variable is .name
-  template:
-    metadata:
-      name: '{{.name}}-external-secrets'
-      annotations:
-        argocd.argoproj.io/sync-wave: "1"
-    spec:
-      project: default
-      source:
-        repoURL: https://github.com/rblundon/homelab.git
-        targetRevision: HEAD
-        path: cluster/external-secrets/overlays/{{.name}}
-      destination:
-        name: '{{.name}}'
-        namespace: openshift-operators
-      syncPolicy:
-        automated:
-          prune: true
-          selfHeal: true
-        syncOptions:
-        - RespectIgnoreDifferences=true
-        - CreateNamespace=true
-        managedNamespaceMetadata:
-          labels:
-            argocd.argoproj.io/managed-by: openshift-gitops
diff --git a/cluster/applications-AoA.yaml b/cluster/temp/applications-AoA.yaml
similarity index 100%
rename from cluster/applications-AoA.yaml
rename to cluster/temp/applications-AoA.yaml
diff --git a/cluster/temp/base/cloudflare-secret-eso.yaml b/cluster/temp/base/cloudflare-secret-eso.yaml
deleted file mode 100644
index 53e2fd0..0000000
--- a/cluster/temp/base/cloudflare-secret-eso.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: cloudflare-api-token # This is the secret name
-  namespace: cert-manager
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: doppler-cluster
-  refreshInterval: "1h"
-  data:
-    - secretKey: api-token
-      remoteRef:
-        key: CLOUDFLARE_TOKEN
diff --git a/cluster/temp/base/clusterissuers.yaml b/cluster/temp/base/clusterissuers.yaml
deleted file mode 100644
index 00c3473..0000000
--- a/cluster/temp/base/clusterissuers.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: letsencrypt-prod
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-spec:
-  acme:
-    email: ryan.blundon@protonmail.com
-    privateKeySecretRef:
-      name: letsencrypt-prod-issuer-account-key
-    server: https://acme-v02.api.letsencrypt.org/directory
-    solvers:
-    - dns01:
-        cloudflare:
-          apiTokenSecretRef:
-            name: cloudflare-api-token
-            key: api-token
-          email: ryan.blundon@protonmail.com
-        cnameStrategy: Follow
-      selector: 
-        dnsZones:
-          - 'mk-labs.cloud'
-          - 'monetnaildesign.com'
-
----
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: letsencrypt-staging
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-spec:
-  acme:
-    email: ryan.blundon@protonmail.com
-    privateKeySecretRef:
-      name: letsencrypt-staging-issuer-account-key
-    server: https://acme-staging-v02.api.letsencrypt.org/directory
-    solvers:
-    - dns01:
-        cloudflare:
-          apiTokenSecretRef:
-            name: cloudflare-api-token
-            key: api-token
-          email: ryan.blundon@protonmail.com
-        cnameStrategy: Follow
-      selector: 
-        dnsZones:
-          - 'mk-labs.cloud'
-          - 'monetnaildesign.com'
diff --git a/cluster/temp/base/kustomization.yaml b/cluster/temp/base/kustomization.yaml
deleted file mode 100644
index 3e571a5..0000000
--- a/cluster/temp/base/kustomization.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-commonAnnotations:
-  argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-
-resources:
-# Operator deployment
-- namespace.yaml
-- operatorgroup.yaml
-- subscription.yaml
-- monitoring.yaml
-# Deploy cluster resources
-# - cloudflare-secret-eso.yaml
-# - clusterissuers.yaml
-# - split-horizon-patch.yaml
-#- api-ingress.yaml
diff --git a/cluster/temp/base/monitoring.yaml b/cluster/temp/base/monitoring.yaml
deleted file mode 100644
index c868148..0000000
--- a/cluster/temp/base/monitoring.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: prometheus-k8s
-  namespace: cert-manager
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - services
-  - endpoints
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: prometheus-k8s
-  namespace: cert-manager
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: prometheus-k8s
-subjects:
-- kind: ServiceAccount
-  name: prometheus-k8s
-  namespace: openshift-monitoring
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app: cert-manager
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/name: cert-manager
-  name: cert-manager
-  namespace: cert-manager
-spec:
-  endpoints:
-  - interval: 30s
-    port: tcp-prometheus-servicemonitor
-    scheme: http
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: controller
-      app.kubernetes.io/instance: cert-manager
-      app.kubernetes.io/name: cert-manager
\ No newline at end of file
diff --git a/cluster/temp/base/namespace.yaml b/cluster/temp/base/namespace.yaml
deleted file mode 100644
index 79127f3..0000000
--- a/cluster/temp/base/namespace.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations: {}
-#    openshift.io/display-name: "cert-manager Operator for Red Hat OpenShift"
-  labels:
-    openshift.io/cluster-monitoring: 'true'
-  name: cert-manager-operator
diff --git a/cluster/temp/base/operatorgroup.yaml b/cluster/temp/base/operatorgroup.yaml
deleted file mode 100644
index ecc0627..0000000
--- a/cluster/temp/base/operatorgroup.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: operators.coreos.com/v1
-kind: OperatorGroup
-metadata:
-  name: openshift-cert-manager-operator
-  namespace: cert-manager-operator
-spec:
-  targetNamespaces:
-    - cert-manager-operator
\ No newline at end of file
diff --git a/cluster/temp/base/split-horizon-patch.yaml b/cluster/temp/base/split-horizon-patch.yaml
deleted file mode 100644
index 9cff70c..0000000
--- a/cluster/temp/base/split-horizon-patch.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: operator.openshift.io/v1alpha1
-kind: CertManager 
-metadata: 
-  name: cluster 
-spec: 
-  managementState: 'Managed'
-  unsupportedConfigOverrides: 
-    controller: 
-      args:
-        - "--dns01-recursive-nameservers=1.1.1.1:53" 
-        - "--dns01-recursive-nameservers-only"
\ No newline at end of file
diff --git a/cluster/temp/base/subscription.yaml b/cluster/temp/base/subscription.yaml
deleted file mode 100644
index 26bc55a..0000000
--- a/cluster/temp/base/subscription.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  name: openshift-cert-manager-operator
-  namespace: cert-manager-operator
-spec:
-  channel: stable-v1
-  installPlanApproval: Automatic
-  name: openshift-cert-manager-operator
-  source: redhat-operators
-  sourceNamespace: openshift-marketplace
\ No newline at end of file
diff --git a/cluster/cert-manager-appset.yaml b/cluster/temp/cert-manager-appset.yaml
similarity index 100%
rename from cluster/cert-manager-appset.yaml
rename to cluster/temp/cert-manager-appset.yaml
diff --git a/cluster/temp/external-secrets-appset.yaml b/cluster/temp/external-secrets-appset.yaml
index 7fab886..5a40088 100644
--- a/cluster/temp/external-secrets-appset.yaml
+++ b/cluster/temp/external-secrets-appset.yaml
@@ -1,29 +1,30 @@
+---
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
-  name: external-secrets
+  name: external-secrets-operator
   namespace: openshift-gitops
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
   generators:
-    - clusters: {} # Automatically use all clusters defined within Argo CD
-    # - list:
-    #     elements:
-    #       - cluster: dev
-    #         url: https://kubernetes-dev.example.com
-    #       - cluster: prod
-    #         url: https://kubernetes-prod.example.com
+  - clusters: {} # Variable is .name
   template:
     metadata:
-      name: '{{cluster}}-external-secrets'
+      name: '{{.name}}-external-secrets'
+      annotations:
+        argocd.argoproj.io/sync-wave: "1"
     spec:
       project: default
       source:
-        repoURL: 'https://github.com/rblundon/homelab.git'
+        repoURL: https://github.com/rblundon/homelab.git
         targetRevision: HEAD
-        path: 'cluster/external-secrets/overlays/{{cluster}}'
+        path: cluster/external-secrets/overlays/{{.name}}
       destination:
-        server: '{{url}}'
-        namespace: external-secrets
+        name: '{{.name}}'
+        namespace: openshift-operators
       syncPolicy:
         automated:
           prune: true
@@ -34,8 +35,3 @@ spec:
         managedNamespaceMetadata:
           labels:
             argocd.argoproj.io/managed-by: openshift-gitops
-      ignoreDifferences:
-      - group: apps
-        kind: Deployment
-        jsonPointers:
-        - /spec/replicas
\ No newline at end of file
diff --git a/cluster/openshift-lightspeed-operator-appset.yaml b/cluster/temp/openshift-lightspeed-operator-appset.yaml
similarity index 100%
rename from cluster/openshift-lightspeed-operator-appset.yaml
rename to cluster/temp/openshift-lightspeed-operator-appset.yaml
diff --git a/cluster/temp/overlays/hub/api-ingress.yaml b/cluster/temp/overlays/hub/api-ingress.yaml
deleted file mode 100644
index c359585..0000000
--- a/cluster/temp/overlays/hub/api-ingress.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  annotations:
-  generation: 1
-  name: letsencrypt
-  namespace: openshift-ingress
-spec:
-  commonName: '*.apps.hub.int.mk-labs.cloud'
-  dnsNames:
-  - '*.apps.hub.int.mk-labs.cloud'
-  duration: 2160h0m0s
-  issuerRef:
-    kind: ClusterIssuer
-    name: letsencrypt-prod
-  renewBefore: 360h0m0s
-  secretName: letsencrypt
-  usages:
-  - server auth
-  - client auth
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  annotations:
-  name: letsencrypt
-  namespace: openshift-config
-spec:
-  commonName: 'api.hub.int.mk-labs.cloud'
-  dnsNames:
-  - api.hub.int.mk-labs.cloud
-  duration: 2160h0m0s
-  issuerRef:
-    kind: ClusterIssuer
-    name: letsencrypt-prod
-  renewBefore: 360h0m0s
-  secretName: letsencrypt
-  usages:
-  - server auth
-  - client auth
\ No newline at end of file
diff --git a/cluster/temp/overlays/hub/apiserver-cert-config.yaml b/cluster/temp/overlays/hub/apiserver-cert-config.yaml
deleted file mode 100644
index c1725b9..0000000
--- a/cluster/temp/overlays/hub/apiserver-cert-config.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: config.openshift.io/v1
-kind: APIServer
-metadata:
-  name: cluster
-spec:
-  servingCerts:
-    namedCertificates:
-    - names:
-      - api.hub.int.mk-labs.cloud
-      servingCertificate:
-        name: letsencrypt
diff --git a/cluster/temp/overlays/hub/ingress-controller-cert-config.yaml b/cluster/temp/overlays/hub/ingress-controller-cert-config.yaml
deleted file mode 100644
index e4b2aeb..0000000
--- a/cluster/temp/overlays/hub/ingress-controller-cert-config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: operator.openshift.io/v1
-kind: IngressController
-metadata:
-  name: default
-  namespace: openshift-ingress-operator
-spec:
-  defaultCertificate:
-    name: letsencrypt
diff --git a/cluster/temp/overlays/hub/kustomization.yaml b/cluster/temp/overlays/hub/kustomization.yaml
deleted file mode 100644
index 986819b..0000000
--- a/cluster/temp/overlays/hub/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-commonAnnotations:
-  argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-
-resources:
-- ../../base
-#- api-ingress.yaml
-#- apiserver-cert-config.yaml
-#- ingress-controller-cert-config.yaml
diff --git a/cluster/synology-storageclass.yaml b/cluster/temp/synology-storageclass.yaml
similarity index 100%
rename from cluster/synology-storageclass.yaml
rename to cluster/temp/synology-storageclass.yaml