diff --git a/infrastructure/controllers/base/monitoring/release.yaml b/infrastructure/controllers/base/monitoring/release.yaml
index ecc5513..54e7b35 100644
--- a/infrastructure/controllers/base/monitoring/release.yaml
+++ b/infrastructure/controllers/base/monitoring/release.yaml
@@ -67,6 +67,8 @@ spec:
       service:
         type: ClusterIP
         port: 3000
+        annotations:
+          tailscale.com/proxy-group: grafana
 
       # Sidecar to auto-load dashboards from ConfigMaps
       sidecar:
diff --git a/infrastructure/controllers/base/tailscale/tsproxy-rtx6000.yaml b/infrastructure/controllers/base/tailscale/tsproxy-rtx6000.yaml
deleted file mode 100644
index 6a9fb19..0000000
--- a/infrastructure/controllers/base/tailscale/tsproxy-rtx6000.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: tailscale.com/v1alpha1 
-kind: ProxyGroup
-metadata:
-  name: rtx6000-brain
-  namespace: customer1
-spec:
-  type: ingress
-  hostnamePrefix: rtx6000-brain
-  tags:
-    - tag:k8s-operator 
diff --git a/infrastructure/gpus/base/vllm-servers/rtx6000-vllm.yaml b/infrastructure/gpus/base/vllm-servers/rtx6000-vllm.yaml
index 1a7e92f..0a4bfcc 100644
--- a/infrastructure/gpus/base/vllm-servers/rtx6000-vllm.yaml
+++ b/infrastructure/gpus/base/vllm-servers/rtx6000-vllm.yaml
@@ -130,6 +130,8 @@ kind: Service
 metadata:
   name: rtx6000-brain-service
   namespace: customer1
+  annotations:
+    tailscale.com/proxy-group: rtx6000-brain
 spec:
   selector:
     app: rtx6000-brain
diff --git a/infrastructure/gpus/staging/kustomization.yaml b/infrastructure/gpus/staging/kustomization.yaml
index adcabb6..3187a27 100644
--- a/infrastructure/gpus/staging/kustomization.yaml
+++ b/infrastructure/gpus/staging/kustomization.yaml
@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- - ../base/vllm-servers/
+ #- ../base/vllm-servers/
  # - ../base/keda-gpu-scaling/ 
diff --git a/infrastructure/tailnet/kustomization.yaml b/infrastructure/tailnet/kustomization.yaml
index 07ef73a..18e5e80 100644
--- a/infrastructure/tailnet/kustomization.yaml
+++ b/infrastructure/tailnet/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - tsproxy-rtx6000.yaml
+  - proxygroup-rtx6000.yaml
+  - proxygroup-grafana.yaml
diff --git a/infrastructure/tailnet/proxygroup-grafana.yaml b/infrastructure/tailnet/proxygroup-grafana.yaml
new file mode 100644
index 0000000..6ff6ee4
--- /dev/null
+++ b/infrastructure/tailnet/proxygroup-grafana.yaml
@@ -0,0 +1,10 @@
+apiVersion: tailscale.com/v1alpha1
+kind: ProxyGroup
+metadata:
+  name: grafana
+  namespace: monitoring
+spec:
+  type: ingress
+  hostnamePrefix: grafana-dashboard
+  tags:
+    - tag:k8s-operator
\ No newline at end of file
diff --git a/infrastructure/tailnet/tsproxy-rtx6000.yaml b/infrastructure/tailnet/proxygroup-rtx6000.yaml
similarity index 91%
rename from infrastructure/tailnet/tsproxy-rtx6000.yaml
rename to infrastructure/tailnet/proxygroup-rtx6000.yaml
index ad0a399..748e1a2 100644
--- a/infrastructure/tailnet/tsproxy-rtx6000.yaml
+++ b/infrastructure/tailnet/proxygroup-rtx6000.yaml
@@ -4,7 +4,7 @@ metadata:
   name: rtx6000-brain
   namespace: customer1
 spec:
-  type: ingress 
+  type: ingress
   hostnamePrefix: rtx6000-brain
   tags:
     - tag:k8s-operator