diff --git a/.gitignore b/.gitignore
index 3aafb64..7a6353d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
 .envrc
-output.yaml
-chart/
diff --git a/k8s-peterg/argocd/clusters.yaml b/k8s-peterg/argocd/clusters.yaml
deleted file mode 100644
index 4a894f8..0000000
--- a/k8s-peterg/argocd/clusters.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: k8s-wheatley-cluster
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: 1password-wheatley
-  target:
-    name: k8s-wheatley-cluster
-    creationPolicy: Owner
-    template:
-      engineVersion: v2
-      type: Opaque
-      metadata:
-        labels:
-          argocd.argoproj.io/secret-type: cluster
-      data:
-        name: k8s-wheatley
-        server: "{{ .endpoint }}"
-        project: argocd
-        config: "{{ .config }}"
-  data:
-    - secretKey: endpoint
-      remoteRef:
-        key: k8s-wheatley_clusterdefinition/endpoint
-    - secretKey: config
-      remoteRef:
-        key: k8s-wheatley_clusterdefinition/config
diff --git a/k8s-peterg/argocd/kustomization.yaml b/k8s-peterg/argocd/kustomization.yaml
index dbb8b6c..6e2d1d7 100644
--- a/k8s-peterg/argocd/kustomization.yaml
+++ b/k8s-peterg/argocd/kustomization.yaml
@@ -6,7 +6,6 @@ resources:
   - install.yaml
   - repository.yaml
   - namespace.yaml
-  - clusters.yaml
 
 namespace: argocd
 
diff --git a/k8s-peterg/cilium/gateways.yaml b/k8s-peterg/cilium-gatewayapi/gateways.yaml
similarity index 100%
rename from k8s-peterg/cilium/gateways.yaml
rename to k8s-peterg/cilium-gatewayapi/gateways.yaml
diff --git a/k8s-peterg/cilium/httproute.yaml b/k8s-peterg/cilium-gatewayapi/httproute.yaml
similarity index 96%
rename from k8s-peterg/cilium/httproute.yaml
rename to k8s-peterg/cilium-gatewayapi/httproute.yaml
index d93c08e..265875b 100644
--- a/k8s-peterg/cilium/httproute.yaml
+++ b/k8s-peterg/cilium-gatewayapi/httproute.yaml
@@ -24,7 +24,7 @@ spec:
   parentRefs:
     - name: internal
       namespace: kube-system
-      sectionName: http
+      sectionName: https
   hostnames:
     - "hubble.k8s.peterg.nl"
   rules:
diff --git a/k8s-peterg/cilium/ip-pool.yaml b/k8s-peterg/cilium-gatewayapi/ip-pool.yaml
similarity index 100%
rename from k8s-peterg/cilium/ip-pool.yaml
rename to k8s-peterg/cilium-gatewayapi/ip-pool.yaml
diff --git a/k8s-peterg/cilium/kustomization.yaml b/k8s-peterg/cilium-gatewayapi/kustomization.yaml
similarity index 100%
rename from k8s-peterg/cilium/kustomization.yaml
rename to k8s-peterg/cilium-gatewayapi/kustomization.yaml
diff --git a/k8s-peterg/cilium/namespace.yaml b/k8s-peterg/cilium-gatewayapi/namespace.yaml
similarity index 100%
rename from k8s-peterg/cilium/namespace.yaml
rename to k8s-peterg/cilium-gatewayapi/namespace.yaml
diff --git a/k8s-peterg/external-secrets-operator/kustomization.yaml b/k8s-peterg/external-secrets-operator/kustomization.yaml
deleted file mode 100644
index 9dc89ef..0000000
--- a/k8s-peterg/external-secrets-operator/kustomization.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - namespace.yaml
-  - secretstore.yaml
-
-helmCharts:
-  - name: external-secrets
-    repo: https://charts.external-secrets.io
-    namespace: external-secrets
-    releaseName: external-secrets
-    version: 1.0.0
diff --git a/k8s-peterg/external-secrets-operator/namespace.yaml b/k8s-peterg/external-secrets-operator/namespace.yaml
deleted file mode 100644
index 591aac5..0000000
--- a/k8s-peterg/external-secrets-operator/namespace.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: external-secrets
diff --git a/k8s-peterg/external-secrets-operator/secretstore.yaml b/k8s-peterg/external-secrets-operator/secretstore.yaml
deleted file mode 100644
index ef27680..0000000
--- a/k8s-peterg/external-secrets-operator/secretstore.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-apiVersion: external-secrets.io/v1
-kind: ClusterSecretStore
-metadata:
-  name: 1password-wheatley
-spec:
-  provider:
-    onepasswordSDK:
-      vault: wheatley
-      auth:
-        serviceAccountSecretRef:
-          namespace: external-secrets
-          name: 1password-token-wheatley
-          key: token
diff --git a/k8s-peterg/kustomization.yaml b/k8s-peterg/kustomization.yaml
index 141e45c..6c0f495 100644
--- a/k8s-peterg/kustomization.yaml
+++ b/k8s-peterg/kustomization.yaml
@@ -4,4 +4,3 @@ kind: Kustomization
 resources:
   - cilium-gatewayapi
   - argocd
-  - external-secrets-operator
diff --git a/k8s-wheatley/base/cilium/gateways.yaml b/k8s-wheatley/base/cilium/gateways.yaml
new file mode 100644
index 0000000..919a70a
--- /dev/null
+++ b/k8s-wheatley/base/cilium/gateways.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: internal
+spec:
+  gatewayClassName: cilium
+  addresses:
+  - type: IPAddress
+    value: 10.13.38.10
+  listeners:
+  - allowedRoutes:
+      namespaces:
+        from: All
+    name: http
+    port: 80
+    protocol: HTTP
diff --git a/k8s-wheatley/cilium/httproute.yaml b/k8s-wheatley/base/cilium/httproute.yaml
similarity index 89%
rename from k8s-wheatley/cilium/httproute.yaml
rename to k8s-wheatley/base/cilium/httproute.yaml
index 5f3260f..aef03d2 100644
--- a/k8s-wheatley/cilium/httproute.yaml
+++ b/k8s-wheatley/base/cilium/httproute.yaml
@@ -10,7 +10,7 @@ spec:
       namespace: kube-system
       sectionName: http
   hostnames:
-    - "hubble.k8s.wheatley.in"
+    - "hubble.k8s-test.wheatley.in"
   rules:
     - backendRefs:
         - name: hubble-ui
diff --git a/k8s-wheatley/cilium/ip-pool.yaml b/k8s-wheatley/base/cilium/ip-pool.yaml
similarity index 89%
rename from k8s-wheatley/cilium/ip-pool.yaml
rename to k8s-wheatley/base/cilium/ip-pool.yaml
index ffc0901..1906b3a 100644
--- a/k8s-wheatley/cilium/ip-pool.yaml
+++ b/k8s-wheatley/base/cilium/ip-pool.yaml
@@ -5,7 +5,7 @@ metadata:
   name: internal-pool
 spec:
   blocks:
-    - cidr: "10.13.38.10/32"
+  - cidr: "10.13.38.10/32"
 ---
 apiVersion: "cilium.io/v2alpha1"
 kind: CiliumL2AnnouncementPolicy
diff --git a/k8s-wheatley/cilium/kustomization.yaml b/k8s-wheatley/base/cilium/kustomization.yaml
similarity index 89%
rename from k8s-wheatley/cilium/kustomization.yaml
rename to k8s-wheatley/base/cilium/kustomization.yaml
index 34f4ff8..1115bd9 100644
--- a/k8s-wheatley/cilium/kustomization.yaml
+++ b/k8s-wheatley/base/cilium/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 namespace: kube-system
 
 resources:
-  - namespace.yaml
   - ip-pool.yaml
   - gateways.yaml
   - httproute.yaml
diff --git a/k8s-wheatley/base/kustomization.yaml b/k8s-wheatley/base/kustomization.yaml
new file mode 100644
index 0000000..17c02fa
--- /dev/null
+++ b/k8s-wheatley/base/kustomization.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - argocd
+  - cilium
+  - metrics-server
diff --git a/k8s-wheatley/base/metrics-server/kustomization.yaml b/k8s-wheatley/base/metrics-server/kustomization.yaml
new file mode 100644
index 0000000..a896b50
--- /dev/null
+++ b/k8s-wheatley/base/metrics-server/kustomization.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+helmCharts:
+  - name: metrics-server
+    repo: https://kubernetes-sigs.github.io/metrics-server/
+    namespace: kube-system
+    releaseName: metrics-server
+    version: 3.13.0
diff --git a/k8s-wheatley/cilium/gateways.yaml b/k8s-wheatley/cilium/gateways.yaml
deleted file mode 100644
index a6179bd..0000000
--- a/k8s-wheatley/cilium/gateways.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: internal
-spec:
-  gatewayClassName: cilium
-  addresses:
-    - type: IPAddress
-      value: 10.13.38.10
-  listeners:
-    - allowedRoutes:
-        namespaces:
-          from: All
-      name: http
-      port: 80
-      protocol: HTTP
diff --git a/k8s-wheatley/cilium/namespace.yaml b/k8s-wheatley/cilium/namespace.yaml
deleted file mode 100644
index 5988ffb..0000000
--- a/k8s-wheatley/cilium/namespace.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-system