diff --git a/infrastructure/controllers/base/tailscale/tsproxy-rtx6000.yaml b/infrastructure/controllers/base/tailscale/tsproxy-rtx6000.yaml
deleted file mode 100644
index 7dac0ff..0000000
--- a/infrastructure/controllers/base/tailscale/tsproxy-rtx6000.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: tailscale.com/v1
-kind: TsProxy
-metadata:
-  name: rtx6000-brain
-  namespace: customer1
-spec:
-  serviceName: rtx6000-brain-service
-  servicePort: 8000
-  hostname: rtx6000-brain
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/tailnet/kustomization.yaml b/infrastructure/tailnet/kustomization.yaml
index 07ef73a..dcaa56d 100644
--- a/infrastructure/tailnet/kustomization.yaml
+++ b/infrastructure/tailnet/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - tsproxy-rtx6000.yaml
+  - proxygroup-rtx6000.yaml
diff --git a/infrastructure/tailnet/proxygroup-rtx6000.yaml b/infrastructure/tailnet/proxygroup-rtx6000.yaml
new file mode 100644
index 0000000..1bf1b1d
--- /dev/null
+++ b/infrastructure/tailnet/proxygroup-rtx6000.yaml
@@ -0,0 +1,9 @@
+apiVersion: tailscale.com/v1alpha1
+kind: ProxyGroup
+metadata:
+  name: rtx6000-brain
+spec:
+  type: ingress
+  hostnamePrefix: rtx6000-brain
+  tags:
+    - tag:k8s
diff --git a/infrastructure/tailnet/tsproxy-rtx6000.yaml b/infrastructure/tailnet/tsproxy-rtx6000.yaml
deleted file mode 100644
index 7dac0ff..0000000
--- a/infrastructure/tailnet/tsproxy-rtx6000.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: tailscale.com/v1
-kind: TsProxy
-metadata:
-  name: rtx6000-brain
-  namespace: customer1
-spec:
-  serviceName: rtx6000-brain-service
-  servicePort: 8000
-  hostname: rtx6000-brain