diff --git a/core-services/traefik/values.yaml b/core-services/traefik/values.yaml
index 8ab66c8..813f6a9 100644
--- a/core-services/traefik/values.yaml
+++ b/core-services/traefik/values.yaml
@@ -25,28 +25,11 @@ topologySpreadConstraints:
       matchLabels:
         app: traefik
 additionalArguments:
-  - "--entryPoints.ssh.address=:22/tcp"
-  - "--entryPoints.minecraft-gtnh.address=:25566/tcp"
-  - "--entryPoints.minecraft-tfg.address=:25567/tcp"
+  - "--entryPoints.ssh.address=:2222/tcp"
 ports:
   ssh:
-    name: ssh
-    port: 22
-    exposedPort: 22
-    expose:
-      default: true
-    protocol: TCP
-  minecraft-gtnh:
-    name: minecraft-gtnh
-    port: 25566
-    exposedPort: 25566
-    expose:
-      default: true
-    protocol: TCP
-  minecraft-tfg:
-    name: minecraft-tfg
-    port: 25567
-    exposedPort: 25567
+    port: 2222
+    exposedPort: 2222
     expose:
       default: true
     protocol: TCP
diff --git a/utility-services/gitea/server/index.ts b/utility-services/gitea/server/index.ts
index 25e7c98..8284ddb 100644
--- a/utility-services/gitea/server/index.ts
+++ b/utility-services/gitea/server/index.ts
@@ -79,7 +79,7 @@ export class GiteaServer extends Construct {
       match: "HostSNI(`*`)",
       entryPoint: "ssh",
       serviceName: `${name}-ssh`,
-      servicePort: 22,
+      servicePort: 2222,
     });
 
     new PublicIngressRoute(this, "http-ingress", {
diff --git a/utility-services/gitea/server/values.yaml b/utility-services/gitea/server/values.yaml
index d51635e..699659f 100644
--- a/utility-services/gitea/server/values.yaml
+++ b/utility-services/gitea/server/values.yaml
@@ -12,6 +12,7 @@ service:
   ssh:
     annotations:
       metallb.universe.tf/allow-shared-ip: gitea
+    port: 2222
 ingress:
   enabled: false
 gitea:
@@ -40,7 +41,7 @@ gitea:
       SSH_DOMAIN: git.dogar.dev
       DISABLE_SSH: false
       SSH_LISTEN_PORT: 2222
-      SSH_PORT: 22
+      SSH_PORT: 2222
     database:
       DB_TYPE: postgres
       HOST: postgres-cluster-rw