diff --git a/template/stacks/observability-client/metrics-server.yaml b/template/stacks/observability-client/metrics-server.yaml
new file mode 100644
index 0000000..caae486
--- /dev/null
+++ b/template/stacks/observability-client/metrics-server.yaml
@@ -0,0 +1,29 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: metrics-server
+  namespace: argocd
+  labels:
+    env: dev
+spec:
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+    retry:
+      limit: -1
+  destination:
+    name: in-cluster
+    namespace: observability
+  sources:
+    - chart: metrics-server
+      repoURL: https://kubernetes-sigs.github.io/metrics-server/
+      targetRevision: 3.12.2
+      helm:
+        valueFiles:
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability-client/metrics-server/values.yaml
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+      targetRevision: HEAD
+      ref: values
diff --git a/template/stacks/observability-client/metrics-server/values.yaml b/template/stacks/observability-client/metrics-server/values.yaml
new file mode 100644
index 0000000..e96ba41
--- /dev/null
+++ b/template/stacks/observability-client/metrics-server/values.yaml
@@ -0,0 +1,4 @@
+metrics:
+  enabled: true
+serviceMonitor:
+  enabled: true