diff --git a/apps/homer/env/k3s-cluster/kustomization.yaml b/apps/homer/env/k3s-cluster/kustomization.yaml
index ffab4ba..a227ac4 100644
--- a/apps/homer/env/k3s-cluster/kustomization.yaml
+++ b/apps/homer/env/k3s-cluster/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
-  - secrets://secret.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file
diff --git a/apps/homer/env/k3s-cluster/secret.yaml b/apps/homer/env/k3s-cluster/secret.yaml
deleted file mode 100644
index 24abbc0..0000000
--- a/apps/homer/env/k3s-cluster/secret.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: homer-secrets
-    namespace: argocd
-type: Opaque
-stringData: {}
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1d47q8mlty404pxx378q49hr93aqexca4mkeqtdm00w4gjd09xd0qhxcdcz
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPMkNTM1BmajJhUWF6UVhr
-            ajhtcWNneXhpL3hJOVFOVUVkR1hrY2JwMmdnCjk3c09BWnBueUdUV01BL3NSUG9F
-            Z01oTG9YZEcwYlBwVTMzdlJSVk9ZLzAKLS0tIGlLZzZ3NXMvQkJjQVd2WDZRck5I
-            MFVyY0tlWlYycjMreDBhazdiVktxSHcKCpS2fHlCH5y6jJ9jBtD/Ud9/Kei+lkl2
-            VvnGtjfiPl1Gfc5rp3tyNGC48ZKUKU1TJbVn7OsXQQ/SiwWMzV7f+A==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-07-15T00:36:24Z"
-    mac: ENC[AES256_GCM,data:Zb96Tp0qJcu6sMx+MR4F0vY3ffxVXLRjgbeYuj235egFQeFpkMlWaNJQaBOtK3CD4It6lilWZXxGyrPdh+ARjQXRoiMBHgVL3dxEwEVXh6rp0XWEBN8Mp2SPzIWYtggDr30HsSSexpd6EaNK7LLDMKnoAR8I/+8ryhHczvPhKSc=,iv:S/KTF+ShwqlDHcrrCHVD8hsmstgeIhDz8gpMH3KN/64=,tag:aAcO6rXW+ryBqxvw59/h1Q==,type:str]
-    pgp: []
-    encrypted_regex: ^(data|stringData)$
-    version: 3.9.0
diff --git a/resources/secrets/base/kustomization.yaml b/resources/secrets/base/kustomization.yaml
deleted file mode 100644
index dfccf13..0000000
--- a/resources/secrets/base/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - secrets+age-import-kubernetes://argocd/sops-age#age.agekey?./postgresql.yaml
\ No newline at end of file
diff --git a/resources/secrets/env/k3s-cluster/Chart.yaml b/resources/secrets/env/k3s-cluster/Chart.yaml
new file mode 100644
index 0000000..62d4ae3
--- /dev/null
+++ b/resources/secrets/env/k3s-cluster/Chart.yaml
@@ -0,0 +1,23 @@
+apiVersion: v2
+name: app-secrets
+description: Applications
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: "1.0"
diff --git a/resources/secrets/env/k3s-cluster/templates/secrets.yaml b/resources/secrets/env/k3s-cluster/templates/secrets.yaml
new file mode 100644
index 0000000..cc3bbea
--- /dev/null
+++ b/resources/secrets/env/k3s-cluster/templates/secrets.yaml
@@ -0,0 +1,9 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: app-secrets
+spec:
+  source:
+    helm:
+      valueFiles:
+        - secrets://secrets/postgresql.yaml
\ No newline at end of file
diff --git a/resources/secrets/base/postgresql.yaml b/resources/secrets/env/k3s-cluster/templates/secrets/postgresql.yaml
similarity index 100%
rename from resources/secrets/base/postgresql.yaml
rename to resources/secrets/env/k3s-cluster/templates/secrets/postgresql.yaml
diff --git a/scripts/argocd-values.yaml b/scripts/argocd-values.yaml
index 38c9cfd..e1e0661 100644
--- a/scripts/argocd-values.yaml
+++ b/scripts/argocd-values.yaml
@@ -32,8 +32,6 @@ redis-ha:
   enabled: true
 
 server:
-  config:
-
   env:
     - name: HELM_PLUGINS
       value: /gitops-tools/helm-plugins/