diff --git a/docker-compose.gitea.yml b/docker-compose.gitea.yml
index 5238e543..e826a1ca 100644
--- a/docker-compose.gitea.yml
+++ b/docker-compose.gitea.yml
@@ -3,14 +3,16 @@ version: "3.8"
 services:
   tailscale:
     image: tailscale/tailscale:latest
-    hostname: tailscale-gitea
+    hostname: gitea
     environment:
       - TS_AUTHKEY=tskey-auth-kNm64Dbcts11CNTRL-4eLQjm2pQYCLdy285gNaYCFDF1KTjP71
         # - TS_EXTRA_ARGS=--advertise-tags=tag:container
+      - TS_SERVE_CONFIG=/config/ts_serve.json
       - TS_STATE_DIR=/var/lib/tailscale
       - TS_USERSPACE=false
     volumes:
       - ./tailscale-nginx/state:/var/lib/tailscale
+      - ./ts_serve.json:/config/ts_serve.json
     devices:
       - /dev/net/tun:/dev/net/tun
     cap_add:
@@ -26,18 +28,15 @@ services:
     restart: unless-stopped
     volumes:
       - gitea-data:/data
-      - tailscale-state:/var/lib/tailscale
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     environment:
       - USER_UID=1000
       - USER_GID=1000
-      - GITEA__server__ROOT_URL=http://gitea/
+      - GITEA__server__ROOT_URL=https://gitea-story-basking.ts.net/
       - GITEA__server__HTTP_PORT=3000
       - GITEA__server__DOMAIN=gitea
       - GITEA__server__SSH_DOMAIN=gitea
-      - TAILSCALE_AUTHKEY=
-      - TAILSCALE_HOSTNAME=gitea
 
 volumes:
   gitea-data:
diff --git a/ts_serve.json b/ts_serve.json
new file mode 100644
index 00000000..2f04eb6c
--- /dev/null
+++ b/ts_serve.json
@@ -0,0 +1,23 @@
+{
+  "TCP": {
+    "443": {
+      "HTTPS": true
+    },
+    "22": {
+	    "TCPForward": "127.0.0.1:22"
+    }
+  },
+  "Web": {
+    "gitea.story-basking.ts.net:443": {
+      "Handlers": {
+        "/": {
+          "Proxy": "http://127.0.0.1:3000"
+        }
+      }
+    }
+  },
+  "AllowFunnel": {
+    "gitea.story-basking.ts.net:443": true,
+    "gitea.story-basking.ts.net:22": true
+  }
+}