diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index 49406edd..8dbb488b 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -429,3 +429,8 @@ module "istio" {
 #   source          = "./discount-bandit"
 #   tls_secret_name = var.tls_secret_name
 # }
+
+module "metrics-server" {
+  source          = "./metrics-server"
+  tls_secret_name = var.tls_secret_name
+}
diff --git a/modules/kubernetes/metrics-server/main.tf b/modules/kubernetes/metrics-server/main.tf
new file mode 100644
index 00000000..b8d14e51
--- /dev/null
+++ b/modules/kubernetes/metrics-server/main.tf
@@ -0,0 +1,32 @@
+variable "tls_secret_name" {}
+
+resource "kubernetes_namespace" "metrics-server" {
+  metadata {
+    name = "metrics-server"
+    # labels = {
+    #   "istio-injection" : "enabled"
+    # }
+  }
+}
+
+module "tls_secret" {
+  source          = "../setup_tls_secret"
+  namespace       = "metrics-server"
+  tls_secret_name = var.tls_secret_name
+
+  depends_on = [kubernetes_namespace.metrics-server]
+}
+
+resource "helm_release" "metrics-server" {
+  namespace        = "metrics-server"
+  create_namespace = false
+  name             = "metrics-server"
+  atomic           = true
+
+  repository = "https://kubernetes-sigs.github.io/metrics-server/"
+  chart      = "metrics-server"
+
+  #   values = [templatefile("${path.module}/values.yaml", {})]
+
+  depends_on = [kubernetes_namespace.metrics-server]
+}