diff --git a/applications/wg-easy/charts/cert-manager/templates/_supportbundle.tpl b/applications/wg-easy/charts/cert-manager/templates/_supportbundle.tpl
index 6e05ee0e..62a1700b 100644
--- a/applications/wg-easy/charts/cert-manager/templates/_supportbundle.tpl
+++ b/applications/wg-easy/charts/cert-manager/templates/_supportbundle.tpl
@@ -6,7 +6,7 @@ metadata:
 spec:
   collectors:
     - logs:
-        namespace: {{ .Release.Namespace }}
+        namespaces: {{ .Release.Namespace }}
         selector:
         - app.kubernetes.io/instance=cert-manager
-{{- end -}} 
+{{- end -}}
diff --git a/applications/wg-easy/charts/wg-easy/templates/_supportbundle.tpl b/applications/wg-easy/charts/wg-easy/templates/_supportbundle.tpl
index 404932e2..6b616ba3 100644
--- a/applications/wg-easy/charts/wg-easy/templates/_supportbundle.tpl
+++ b/applications/wg-easy/charts/wg-easy/templates/_supportbundle.tpl
@@ -5,6 +5,9 @@ metadata:
   name: wg-easy-supportbundle
 spec:
   collectors:
+    - clusterResources:
+        namespaces:
+          - {{ .Release.Namespace }}
     - logs:
         namespace: {{ .Release.Namespace }}
         selector:
@@ -21,4 +24,4 @@ spec:
           - pass:
               when: 'net.ipv4.ip_forward == 1'
               message: "IP forwarding is enabled."
-{{- end -}} 
+{{- end -}}
diff --git a/applications/wg-easy/replicated/cluster.yaml b/applications/wg-easy/replicated/cluster.yaml
index 7a3deb7b..909d398c 100644
--- a/applications/wg-easy/replicated/cluster.yaml
+++ b/applications/wg-easy/replicated/cluster.yaml
@@ -1,10 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/replicatedhq/embedded-cluster/refs/heads/main/operator/schemas/config-embeddedcluster-v1beta1.json
+
 apiVersion: embeddedcluster.replicated.com/v1beta1
 kind: Config
 spec:
-  version: 2.1.3+k8s-1.29
+  version: 2.8.1+k8s-1.31
+  domains:
+    proxyRegistryDomain: proxy.xdrcft.net
+    replicatedAppDomain: app.xdrcft.net
   unsupportedOverrides:
     k0s: |-
-      config: 
+      config:
         spec:
           workerProfiles:
             - name: default