diff --git a/tools/local-ci/docker-compose.override.yml b/tools/local-ci/docker-compose.override.yml
new file mode 100644
index 0000000..f1555ff
--- /dev/null
+++ b/tools/local-ci/docker-compose.override.yml
@@ -0,0 +1,16 @@
+# Local-only override: this developer's host already runs another
+# Gitea instance bound to 0.0.0.0:3000 and 0.0.0.0:2222, so the
+# default port mappings in docker-compose.yml conflict. Remap the
+# local-ci Gitea to 13000 (HTTP) and 12222 (SSH) on the host. The
+# in-network ports stay 3000 / 22 — runners and workflow containers
+# keep reaching Gitea by hostname through the compose network.
+#
+# This file is intentionally NOT committed to the repo; it captures
+# per-host port allocation. Use `make -C tools/local-ci push` only
+# after pointing the `local-gitea` git remote at the override port.
+
+services:
+  gitea:
+    ports: !override
+      - "13000:3000"
+      - "12222:22"
diff --git a/tools/local-dev/.env b/tools/local-dev/.env
index 134bd54..187a602 100644
--- a/tools/local-dev/.env
+++ b/tools/local-dev/.env
@@ -14,8 +14,8 @@
 #LOCAL_DEV_POSTGRES_PORT=5433
 #LOCAL_DEV_REDIS_PORT=6380
 #LOCAL_DEV_MAILPIT_PORT=8025
-#LOCAL_DEV_GATEWAY_REST_PORT=8080
-#LOCAL_DEV_GATEWAY_GRPC_PORT=9090
+LOCAL_DEV_GATEWAY_REST_PORT=18080
+LOCAL_DEV_GATEWAY_GRPC_PORT=19090
 
 # Six-digit decimal accepted by ConfirmEmailCode in addition to the
 # real bcrypt-verified code. Leave the value blank to disable the