diff --git a/k8s/base/app.yml b/k8s/base/app-cnpg.yml
similarity index 55%
rename from k8s/base/app.yml
rename to k8s/base/app-cnpg.yml
index a990d61..3b661df 100644
--- a/k8s/base/app.yml
+++ b/k8s/base/app-cnpg.yml
@@ -1,13 +1,13 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: kustomize-example
+  name: cnpg-app
 spec:
   project: default
   source:
-    path: examples/helloWorld
-    repoURL: 'https://github.com/kubernetes-sigs/kustomize'
-    targetRevision: HEAD
+    chart: cloudnative-pg
+    repoURL: 'https://cloudnative-pg.github.io/charts'
+    targetRevision: 1.27.1
   destination:
     namespace: default
     server: 'https://kubernetes.default.svc'
\ No newline at end of file
diff --git a/k8s/base/app-envoy.yml b/k8s/base/app-envoy.yml
new file mode 100644
index 0000000..1bd055e
--- /dev/null
+++ b/k8s/base/app-envoy.yml
@@ -0,0 +1,13 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: envoy-app
+spec:
+  project: default
+  source:
+    chart: gateway-helm
+    repoURL: docker.io/envoyproxy
+    targetRevision: v1.5.4
+  destination:
+    namespace: default
+    server: 'https://kubernetes.default.svc'
\ No newline at end of file
diff --git a/k8s/base/app-khmereid.yml b/k8s/base/app-khmereid.yml
new file mode 100644
index 0000000..21d2fc0
--- /dev/null
+++ b/k8s/base/app-khmereid.yml
@@ -0,0 +1,12 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: khmereid-app
+spec:
+  project: default
+  source:
+    repoURL: 'https://gitea.internal.ekycsolutions.com/xadminx/khmereid-backend-temp.git'
+    targetRevision: main
+  destination:
+    namespace: default
+    server: 'https://kubernetes.default.svc'
\ No newline at end of file
diff --git a/k8s/base/app-kratos.yml b/k8s/base/app-kratos.yml
new file mode 100644
index 0000000..2eef632
--- /dev/null
+++ b/k8s/base/app-kratos.yml
@@ -0,0 +1,15 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kratos-app
+spec:
+  project: default
+  source:
+    chart: kratos
+    repoURL: 'https://k8s.ory.sh/helm/charts'
+    targetRevision: v1.3.1
+    kustomize:
+      buildOptions: "--load-restrictor LoadRestrictionsNone"
+  destination:
+    namespace: default
+    server: 'https://kubernetes.default.svc'
\ No newline at end of file
diff --git a/k8s/khmer-eid.yml b/k8s/base/deployment.yml
similarity index 100%
rename from k8s/khmer-eid.yml
rename to k8s/base/deployment.yml
diff --git a/k8s/envoy.yml b/k8s/base/envoy.yml
similarity index 100%
rename from k8s/envoy.yml
rename to k8s/base/envoy.yml
diff --git a/k8s/hanko.yml b/k8s/base/hanko.yml
similarity index 100%
rename from k8s/hanko.yml
rename to k8s/base/hanko.yml
diff --git a/k8s/kratos.yml b/k8s/base/kratos.yml
similarity index 100%
rename from k8s/kratos.yml
rename to k8s/base/kratos.yml
diff --git a/k8s/base/kustomization.yml b/k8s/base/kustomization.yml
index c80ac6b..8e903e9 100644
--- a/k8s/base/kustomization.yml
+++ b/k8s/base/kustomization.yml
@@ -1,5 +1,16 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
-  - app.yml
+  - app-kratos.yml
+  - app-cnpg.yml
+  - app-envoy.yml
+  - envoy.yml
+  - kratos.yml
+  - postgres-dotnet.yml
+  - postgres-kratos.yml
+  # - app-khmereid.yml
 
 configMapGenerator:
   - name: kratos-config
diff --git a/k8s/postgres-dotnet.yml b/k8s/base/postgres-dotnet.yml
similarity index 100%
rename from k8s/postgres-dotnet.yml
rename to k8s/base/postgres-dotnet.yml
diff --git a/k8s/postgres-kratos.yml b/k8s/base/postgres-kratos.yml
similarity index 100%
rename from k8s/postgres-kratos.yml
rename to k8s/base/postgres-kratos.yml
diff --git a/k8s/kustomization.yml b/k8s/kustomization.yml
deleted file mode 100644
index dada67d..0000000
--- a/k8s/kustomization.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-resources:
-  - envoy.yml
-  # - khmer-eid.yml
-  - kratos.yml
-  - nginx-temp.yml
-  # - hanko.yml
-
diff --git a/k8s/local/kustomization.yml b/k8s/local/kustomization.yml
new file mode 100644
index 0000000..4e6ffbf
--- /dev/null
+++ b/k8s/local/kustomization.yml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+  - nginx-temp.yml
\ No newline at end of file
diff --git a/k8s/nginx-temp.yml b/k8s/local/nginx-temp.yml
similarity index 100%
rename from k8s/nginx-temp.yml
rename to k8s/local/nginx-temp.yml
diff --git a/k8s/uat/kustomization.yml b/k8s/uat/kustomization.yml
new file mode 100644
index 0000000..82e7d71
--- /dev/null
+++ b/k8s/uat/kustomization.yml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
\ No newline at end of file