diff --git a/infrastructure/addons/flux-ui/flux-tailscale-service.yaml b/infrastructure/addons/flux-ui/flux-tailscale-service.yaml
index 739bab9..c5f9c35 100644
--- a/infrastructure/addons/flux-ui/flux-tailscale-service.yaml
+++ b/infrastructure/addons/flux-ui/flux-tailscale-service.yaml
@@ -10,9 +10,10 @@ spec:
   type: LoadBalancer
   loadBalancerClass: tailscale
   selector:
-    app.kubernetes.io/name: weave-gitops
+    app.kubernetes.io/name: gitops-server
+    app.kubernetes.io/instance: weave-gitops
   ports:
     - name: http
       port: 9001
       protocol: TCP
-      targetPort: 9001
+      targetPort: http
diff --git a/infrastructure/addons/observability/helmrelease-kube-prometheus-stack.yaml b/infrastructure/addons/observability/helmrelease-kube-prometheus-stack.yaml
index b2467d8..a364dda 100644
--- a/infrastructure/addons/observability/helmrelease-kube-prometheus-stack.yaml
+++ b/infrastructure/addons/observability/helmrelease-kube-prometheus-stack.yaml
@@ -25,8 +25,7 @@ spec:
     grafana:
       enabled: true
       admin:
-        user: admin
-        password: admin123
+        existingSecret: grafana-admin-credentials
       grafana.ini:
         server:
           root_url: http://grafana.silverside-gopher.ts.net/
diff --git a/infrastructure/addons/observability/kustomization.yaml b/infrastructure/addons/observability/kustomization.yaml
index ceb5acd..27173c3 100644
--- a/infrastructure/addons/observability/kustomization.yaml
+++ b/infrastructure/addons/observability/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - namespace.yaml
+  - grafana-admin-externalsecret.yaml
   - helmrepository-prometheus-community.yaml
   - helmrepository-grafana.yaml
   - helmrelease-kube-prometheus-stack.yaml
diff --git a/infrastructure/addons/observability/prometheus-tailscale-service.yaml b/infrastructure/addons/observability/prometheus-tailscale-service.yaml
index 6a6ad57..3e641f3 100644
--- a/infrastructure/addons/observability/prometheus-tailscale-service.yaml
+++ b/infrastructure/addons/observability/prometheus-tailscale-service.yaml
@@ -11,6 +11,7 @@ spec:
   loadBalancerClass: tailscale
   selector:
     app.kubernetes.io/name: prometheus
+    operator.prometheus.io/name: observability-kube-prometh-prometheus
   ports:
     - name: http
       port: 9090