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/tailnet/kustomization.yaml b/infrastructure/tailnet/kustomization.yaml
index dcaa56d..18e5e80 100644
--- a/infrastructure/tailnet/kustomization.yaml
+++ b/infrastructure/tailnet/kustomization.yaml
@@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - 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..be69bb6
--- /dev/null
+++ b/infrastructure/tailnet/proxygroup-grafana.yaml
@@ -0,0 +1,9 @@
+apiVersion: tailscale.com/v1alpha1
+kind: ProxyGroup
+metadata:
+  name: grafana
+spec:
+  type: ingress
+  hostnamePrefix: grafana-dashboard
+  tags:
+    - tag:k8s-operator
\ No newline at end of file