diff --git a/gitea-docker-compose.yaml b/gitea-docker-compose.yaml
index 8f510ac..60b0465 100644
--- a/gitea-docker-compose.yaml
+++ b/gitea-docker-compose.yaml
@@ -5,17 +5,18 @@ services:
     environment:
       - USER_UID=1000
       - USER_GID=1000
+      # Database
       - GITEA__database__DB_TYPE=postgres
       - GITEA__database__HOST=db:5432
       - GITEA__database__NAME=gitea
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=gitea
-      - GITEA__server__DOMAIN=gitea.forust.xyz
-      - GITEA__server__ROOT_URL=https://gitea.forust.xyz/
-      - GITEA__server__SSH_DOMAIN=gitea.forust.xyz
+      #Server
+      - GITEA__server__ROOT_URL=https://gitea.forust.xyz
+      - GITEA__server__SSH_PORT=2221
     restart: always
     networks:
-      - gitea
+      - gitea-db
       - traefik-proxy
     volumes:
       - ./gitea:/data
@@ -25,7 +26,7 @@ services:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik-proxy"
     ports:
-      - "222:22"
+      - "2221:22"
     depends_on:
       - db
       
@@ -37,7 +38,7 @@ services:
       - POSTGRES_PASSWORD=gitea
       - POSTGRES_DB=gitea
     networks:
-      - gitea
+      - gitea-db
     volumes:
       - ./volumes/gitea/postgres:/var/lib/postgresql/data
       
diff --git a/traefik-docker-compose.yaml b/traefik-docker-compose.yaml
index 03e16b8..9b99664 100644
--- a/traefik-docker-compose.yaml
+++ b/traefik-docker-compose.yaml
@@ -21,6 +21,7 @@ services:
       - "--entryPoints.websecure.http.tls=true"
       - "--entryPoints.web.http.redirections.entryPoint.to=websecure"
       - "--entryPoints.web.http.redirections.entryPoint.scheme=https"
+      - "--entryPoints.ssh.address=:222"
       
       # Let's Encrypt STAGING. CURRENTLY USING CF ORIGIN CA INSTEAD
       # - "--certificatesresolvers.letsencrypt.acme.email=${EMAIL}"
diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml
index 721710d..e7c638a 100644
--- a/traefik/dynamic/dynamic.yml
+++ b/traefik/dynamic/dynamic.yml
@@ -73,6 +73,14 @@ http:
         - security-headers
       tls: {}
 
+    # Gitea SSH
+    gitea-ssh:
+      rule: "HostSNI(`*`)"
+      entryPoints:
+        - ssh
+      service: gitea-ssh
+      tls: {}
+
     # Glance (local only)
     glance:
       rule: "Host(`glance.workstation`)"
@@ -162,6 +170,13 @@ http:
         servers:
           - url: "http://gitea:3000"
 
+    # Gitea SSH
+    gitea-ssh:
+      loadBalancer:
+        servers:
+          - url: "ssh://gitea:22"
+
+
   serversTransports:
     insecureTransport:
       insecureSkipVerify: true