diff --git a/Makefile b/Makefile
index 4b5fe625d..48d4262a2 100644
--- a/Makefile
+++ b/Makefile
@@ -356,6 +356,7 @@ local-cleanup: ## Delete local cluster
 local-cluster-setup: ## Sets up Kind cluster with GatewayAPI manifests and istio GW, nothing Kuadrant.
 	$(MAKE) kind-delete-cluster
 	$(MAKE) kind-create-cluster
+	$(MAKE) deploy-metrics-server
 	$(MAKE) namespace
 	$(MAKE) gateway-api-install
 	$(MAKE) install-metallb
diff --git a/config/metrics-server/kustomization.yaml b/config/metrics-server/kustomization.yaml
new file mode 100644
index 000000000..2b933c7cb
--- /dev/null
+++ b/config/metrics-server/kustomization.yaml
@@ -0,0 +1,13 @@
+---
+resources:
+  - https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.7.1/components.yaml
+patches:
+  - patch: |-
+      - op: add
+        path: /spec/template/spec/containers/0/args/-
+        value: --kubelet-insecure-tls
+    target:
+      version: v1
+      kind: Deployment
+      name: metrics-server
+      namespace: kube-system
diff --git a/make/metrics-server.mk b/make/metrics-server.mk
new file mode 100644
index 000000000..5d313bddb
--- /dev/null
+++ b/make/metrics-server.mk
@@ -0,0 +1,7 @@
+
+##@ kubernetes metrics server
+## https://github.com/kubernetes-sigs/metrics-server
+
+.PHONY: deploy-metrics-server
+deploy-metrics-server: kustomize ## Deploy Gateway API gateway
+	$(KUSTOMIZE) build config/metrics-server | kubectl apply -f -