diff --git a/clusters/artemis/apps/cnpg/app-project.yaml b/clusters/artemis/apps/cnpg/app-project.yaml
new file mode 100644
index 0000000..7c5f5b6
--- /dev/null
+++ b/clusters/artemis/apps/cnpg/app-project.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: cnpg
+spec:
+  description: Cloud Native Postgress Operator
+  sourceRepos:
+    - '*'
+  sourceNamespaces:
+    - '*'
+  destinations:
+    - namespace: 'cnpg-system'
+      server: '*'
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
diff --git a/clusters/artemis/apps/cnpg/application.yaml b/clusters/artemis/apps/cnpg/application.yaml
new file mode 100644
index 0000000..db827cd
--- /dev/null
+++ b/clusters/artemis/apps/cnpg/application.yaml
@@ -0,0 +1,24 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cnpg
+  namespace: cnpg-system
+  labels:
+    platform.dgse.cloud/cluster: artemis
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: cnpg
+  source:
+    repoURL: 'https://git.dgse.cloud/DGSE/kubernetes.git'
+    path: manifests/artemis/cnpg
+    targetRevision: HEAD
+  destination:
+    namespace: cnpg-system
+    name: in-cluster
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/clusters/artemis/apps/cnpg/kustomization.yaml b/clusters/artemis/apps/cnpg/kustomization.yaml
new file mode 100644
index 0000000..f9b2a4b
--- /dev/null
+++ b/clusters/artemis/apps/cnpg/kustomization.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - app-project.yaml
+  - application.yaml
diff --git a/clusters/artemis/apps/external-secrets/app-project.yaml b/clusters/artemis/apps/external-secrets/app-project.yaml
new file mode 100644
index 0000000..92fce2d
--- /dev/null
+++ b/clusters/artemis/apps/external-secrets/app-project.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: external-secrets
+spec:
+  description: Secrets Management for platform
+  sourceRepos:
+    - '*'
+  sourceNamespaces:
+    - '*'
+  destinations:
+    - namespace: 'external-secrets'
+      server: '*'
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
diff --git a/clusters/artemis/apps/external-secrets/application.yaml b/clusters/artemis/apps/external-secrets/application.yaml
new file mode 100644
index 0000000..79456b0
--- /dev/null
+++ b/clusters/artemis/apps/external-secrets/application.yaml
@@ -0,0 +1,24 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: external-secrets
+  namespace: external-secrets
+  labels:
+    platform.dgse.cloud/cluster: artemis
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: external-secrets
+  source:
+    repoURL: 'https://git.dgse.cloud/DGSE/kubernetes.git'
+    path: manifests/artemis/external-secrets
+    targetRevision: HEAD
+  destination:
+    namespace: external-secrets
+    name: in-cluster
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/clusters/artemis/apps/external-secrets/kustomization.yaml b/clusters/artemis/apps/external-secrets/kustomization.yaml
new file mode 100644
index 0000000..f9b2a4b
--- /dev/null
+++ b/clusters/artemis/apps/external-secrets/kustomization.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - app-project.yaml
+  - application.yaml
diff --git a/clusters/artemis/apps/kustomization.yaml b/clusters/artemis/apps/kustomization.yaml
index 0baa98b..457d97c 100644
--- a/clusters/artemis/apps/kustomization.yaml
+++ b/clusters/artemis/apps/kustomization.yaml
@@ -7,3 +7,5 @@ resources:
   - vault
   - gitea-runners
   - gitea
+  - cnpg
+  - external-secrets
diff --git a/manifests/artemis/cnpg/kustomization.yaml b/manifests/artemis/cnpg/kustomization.yaml
new file mode 100644
index 0000000..98d001f
--- /dev/null
+++ b/manifests/artemis/cnpg/kustomization.yaml
@@ -0,0 +1,10 @@
+---
+#resources:
+#  - cert.yaml
+
+helmCharts:
+  - name: cloudnative-pg
+    repo: https://cloudnative-pg.github.io/charts
+    version: 0.26.0
+    releaseName: cnpg
+    namespace: cnpg-system
diff --git a/manifests/artemis/external-secrets/kustomization.yaml b/manifests/artemis/external-secrets/kustomization.yaml
new file mode 100644
index 0000000..4cf1ef0
--- /dev/null
+++ b/manifests/artemis/external-secrets/kustomization.yaml
@@ -0,0 +1,10 @@
+---
+resources:
+  - platform-cluster-secret-store.yaml
+
+helmCharts:
+  - name: external-secrets
+    repo: https://charts.external-secrets.io/
+    version: 0.18.1
+    releaseName: external-secrets
+    namespace: external-secrets
\ No newline at end of file
diff --git a/manifests/artemis/external-secrets/platform-cluster-secret-store.yaml b/manifests/artemis/external-secrets/platform-cluster-secret-store.yaml
new file mode 100644
index 0000000..97b0ff7
--- /dev/null
+++ b/manifests/artemis/external-secrets/platform-cluster-secret-store.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: external-secrets.io/v1
+kind: ClusterSecretStore
+metadata:
+  name: platform
+spec:
+  provider:
+    vault:
+      server: "http://vault.vault:8200"
+      path: "platform"
+      version: "v2"
+      auth:
+        kubernetes:
+          mountPath: "kubernetes"
+          role: "eso"