diff --git a/k8s-peterg/argocd/clusters.yaml b/k8s-peterg/argocd/clusters.yaml
new file mode 100644
index 0000000..4a894f8
--- /dev/null
+++ b/k8s-peterg/argocd/clusters.yaml
@@ -0,0 +1,30 @@
+---
+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 6e2d1d7..dbb8b6c 100644
--- a/k8s-peterg/argocd/kustomization.yaml
+++ b/k8s-peterg/argocd/kustomization.yaml
@@ -6,6 +6,7 @@ resources:
   - install.yaml
   - repository.yaml
   - namespace.yaml
+  - clusters.yaml
 
 namespace: argocd
 
diff --git a/k8s-wheatley/base/cilium/gateways.yaml b/k8s-wheatley/base/cilium/gateways.yaml
deleted file mode 100644
index 919a70a..0000000
--- a/k8s-wheatley/base/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/base/kustomization.yaml b/k8s-wheatley/base/kustomization.yaml
deleted file mode 100644
index 17c02fa..0000000
--- a/k8s-wheatley/base/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-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
deleted file mode 100644
index a896b50..0000000
--- a/k8s-wheatley/base/metrics-server/kustomization.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-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
new file mode 100644
index 0000000..a6179bd
--- /dev/null
+++ b/k8s-wheatley/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/base/cilium/httproute.yaml b/k8s-wheatley/cilium/httproute.yaml
similarity index 89%
rename from k8s-wheatley/base/cilium/httproute.yaml
rename to k8s-wheatley/cilium/httproute.yaml
index aef03d2..5f3260f 100644
--- a/k8s-wheatley/base/cilium/httproute.yaml
+++ b/k8s-wheatley/cilium/httproute.yaml
@@ -10,7 +10,7 @@ spec:
       namespace: kube-system
       sectionName: http
   hostnames:
-    - "hubble.k8s-test.wheatley.in"
+    - "hubble.k8s.wheatley.in"
   rules:
     - backendRefs:
         - name: hubble-ui
diff --git a/k8s-wheatley/base/cilium/ip-pool.yaml b/k8s-wheatley/cilium/ip-pool.yaml
similarity index 89%
rename from k8s-wheatley/base/cilium/ip-pool.yaml
rename to k8s-wheatley/cilium/ip-pool.yaml
index 1906b3a..ffc0901 100644
--- a/k8s-wheatley/base/cilium/ip-pool.yaml
+++ b/k8s-wheatley/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/base/cilium/kustomization.yaml b/k8s-wheatley/cilium/kustomization.yaml
similarity index 89%
rename from k8s-wheatley/base/cilium/kustomization.yaml
rename to k8s-wheatley/cilium/kustomization.yaml
index 1115bd9..34f4ff8 100644
--- a/k8s-wheatley/base/cilium/kustomization.yaml
+++ b/k8s-wheatley/cilium/kustomization.yaml
@@ -4,6 +4,7 @@ kind: Kustomization
 namespace: kube-system
 
 resources:
+  - namespace.yaml
   - ip-pool.yaml
   - gateways.yaml
   - httproute.yaml
diff --git a/k8s-wheatley/cilium/namespace.yaml b/k8s-wheatley/cilium/namespace.yaml
new file mode 100644
index 0000000..5988ffb
--- /dev/null
+++ b/k8s-wheatley/cilium/namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kube-system