diff --git a/infra/apps/core/accounts/base/oci-repository.yaml b/infra/apps/core/accounts/base/oci-repository.yaml
index de4a072..8ca4ca0 100644
--- a/infra/apps/core/accounts/base/oci-repository.yaml
+++ b/infra/apps/core/accounts/base/oci-repository.yaml
@@ -4,7 +4,7 @@ metadata:
   name: accounts-chart
 spec:
   interval: 10m0s
-  url: oci://ghcr.io/x-evor/charts/app-service
+  url: oci://ghcr.io/x-evor/app-service
   ref:
     semver: "0.1.0"
   layerSelector:
diff --git a/infra/apps/core/console/base/oci-repository.yaml b/infra/apps/core/console/base/oci-repository.yaml
index 9150428..2d2980c 100644
--- a/infra/apps/core/console/base/oci-repository.yaml
+++ b/infra/apps/core/console/base/oci-repository.yaml
@@ -4,7 +4,7 @@ metadata:
   name: console-chart
 spec:
   interval: 10m0s
-  url: oci://ghcr.io/x-evor/charts/app-service
+  url: oci://ghcr.io/x-evor/app-service
   ref:
     semver: "0.1.0"
   layerSelector:
diff --git a/infra/clusters/prod/infrastructure-kustomization.yaml b/infra/clusters/prod/infrastructure-kustomization.yaml
index 8e76df3..82df881 100644
--- a/infra/clusters/prod/infrastructure-kustomization.yaml
+++ b/infra/clusters/prod/infrastructure-kustomization.yaml
@@ -12,3 +12,5 @@ spec:
     kind: GitRepository
     name: platform-config
   path: ./infra/infrastructure
+  dependsOn:
+    - name: platform-secrets-stack
diff --git a/infra/clusters/prod/kustomization.yaml b/infra/clusters/prod/kustomization.yaml
index 6ab8ebd..36719a9 100644
--- a/infra/clusters/prod/kustomization.yaml
+++ b/infra/clusters/prod/kustomization.yaml
@@ -3,6 +3,8 @@ kind: Kustomization
 resources:
   - namespaces.yaml
   - platform-kustomization.yaml
+  - platform-secrets-kustomization.yaml
+  - platform-services-kustomization.yaml
   - infrastructure-kustomization.yaml
   - observability-kustomization.yaml
   - console-prod-kustomization.yaml
diff --git a/infra/clusters/prod/platform-secrets-kustomization.yaml b/infra/clusters/prod/platform-secrets-kustomization.yaml
new file mode 100644
index 0000000..fa82f49
--- /dev/null
+++ b/infra/clusters/prod/platform-secrets-kustomization.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: platform-secrets-stack
+  namespace: flux-system
+spec:
+  interval: 5m0s
+  prune: true
+  wait: true
+  timeout: 5m0s
+  sourceRef:
+    kind: GitRepository
+    name: platform-config
+  path: ./infra/platform-secrets
+  dependsOn:
+    - name: platform-stack
diff --git a/infra/clusters/prod/platform-services-kustomization.yaml b/infra/clusters/prod/platform-services-kustomization.yaml
new file mode 100644
index 0000000..4372d37
--- /dev/null
+++ b/infra/clusters/prod/platform-services-kustomization.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: platform-services-stack
+  namespace: flux-system
+spec:
+  interval: 5m0s
+  prune: true
+  wait: true
+  timeout: 10m0s
+  sourceRef:
+    kind: GitRepository
+    name: platform-config
+  path: ./infra/platform/external-dns
+  dependsOn:
+    - name: platform-secrets-stack
diff --git a/infra/infrastructure/postgresql/oci-repository.yaml b/infra/infrastructure/postgresql/oci-repository.yaml
index b58c658..dbddf49 100644
--- a/infra/infrastructure/postgresql/oci-repository.yaml
+++ b/infra/infrastructure/postgresql/oci-repository.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: database
 spec:
   interval: 10m0s
-  url: oci://ghcr.io/x-evor/charts/postgresql
+  url: oci://ghcr.io/x-evor/postgresql
   ref:
     semver: "1.1.0"
   layerSelector:
diff --git a/infra/observability/observability-stack/oci-repository.yaml b/infra/observability/observability-stack/oci-repository.yaml
index acb0416..cb7b0cf 100644
--- a/infra/observability/observability-stack/oci-repository.yaml
+++ b/infra/observability/observability-stack/oci-repository.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: observability
 spec:
   interval: 10m0s
-  url: oci://ghcr.io/x-evor/charts/observability
+  url: oci://ghcr.io/x-evor/observability
   ref:
     semver: "0.1.0"
   layerSelector:
diff --git a/infra/platform/external-secrets/clustersecretstore.yaml b/infra/platform-secrets/clustersecretstore.yaml
similarity index 99%
rename from infra/platform/external-secrets/clustersecretstore.yaml
rename to infra/platform-secrets/clustersecretstore.yaml
index 1933b51..ed57d74 100644
--- a/infra/platform/external-secrets/clustersecretstore.yaml
+++ b/infra/platform-secrets/clustersecretstore.yaml
@@ -15,4 +15,3 @@ spec:
           serviceAccountRef:
             name: external-secrets
             namespace: platform
-
diff --git a/infra/platform-secrets/kustomization.yaml b/infra/platform-secrets/kustomization.yaml
new file mode 100644
index 0000000..a9d66de
--- /dev/null
+++ b/infra/platform-secrets/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - clustersecretstore.yaml
diff --git a/infra/platform/external-secrets/kustomization.yaml b/infra/platform/external-secrets/kustomization.yaml
index 7f00af5..4fd939d 100644
--- a/infra/platform/external-secrets/kustomization.yaml
+++ b/infra/platform/external-secrets/kustomization.yaml
@@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - helmrelease.yaml
-  - clustersecretstore.yaml
diff --git a/infra/platform/k3s-platform/oci-repository.yaml b/infra/platform/k3s-platform/oci-repository.yaml
index 238777a..41a01f8 100644
--- a/infra/platform/k3s-platform/oci-repository.yaml
+++ b/infra/platform/k3s-platform/oci-repository.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: platform
 spec:
   interval: 10m0s
-  url: oci://ghcr.io/x-evor/charts/k3s-platform-chart
+  url: oci://ghcr.io/x-evor/k3s-platform-chart
   ref:
     semver: "0.1.0"
   layerSelector:
diff --git a/infra/platform/kustomization.yaml b/infra/platform/kustomization.yaml
index d6d236a..8ed96d7 100644
--- a/infra/platform/kustomization.yaml
+++ b/infra/platform/kustomization.yaml
@@ -4,5 +4,4 @@ resources:
   - repositories.yaml
   - k3s-platform
   - external-secrets
-  - external-dns
   - reloader