diff --git a/Dockerfile b/Dockerfile
index c1a7907..5650adb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,9 +17,11 @@ COPY src/ src/
 RUN adduser --disabled-password --no-create-home appuser
 USER appuser
 
-EXPOSE 8000
+EXPOSE 3000
+
+ENV PORT=3000
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
-    CMD python -c "import httpx; httpx.get('http://localhost:8000/mcp', timeout=5)" || exit 1
+    CMD python -c "import httpx; httpx.get('http://localhost:3000/mcp', timeout=5)" || exit 1
 
 CMD ["python", "src/server.py"]
diff --git a/README.md b/README.md
index 3409d41..abe3df4 100755
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ MCP_API_KEY=your-secret-key python src/server.py
 npx @modelcontextprotocol/inspector
 ```
 
-Open http://localhost:3000 and connect to `http://localhost:8000/mcp` using "Streamable HTTP" transport. Pass `Authorization: Bearer your-secret-key` header.
+Open http://localhost:3000 and connect to `http://localhost:3000/mcp` using "Streamable HTTP" transport. Pass `Authorization: Bearer your-secret-key` header.
 
 ## Authentication
 
@@ -74,7 +74,7 @@ When connecting from Poke, add the bearer token in your connection settings.
 docker build -t poke-mail .
 
 docker run -d \
-  -p 8000:8000 \
+  -p 3000:3000 \
   -v $(pwd)/config.yml:/app/config.yml:ro \
   -e MCP_API_KEY=your-secret-key \
   poke-mail
@@ -84,7 +84,7 @@ Or use the pre-built image from GitHub Container Registry:
 
 ```bash
 docker run -d \
-  -p 8000:8000 \
+  -p 3000:3000 \
   -v $(pwd)/config.yml:/app/config.yml:ro \
   -e MCP_API_KEY=your-secret-key \
   ghcr.io/OWNER/poke-mail:main
@@ -114,7 +114,7 @@ docker run -d \
 | `CONFIG_PATH` | `config.yml` | Path to config file |
 | `POKE_WEBHOOK_URL` | from config | Overrides webhook URL in config |
 | `POKE_API_KEY` | from config | Overrides Poke API key in config |
-| `PORT` | `8000` | HTTP server port |
+| `PORT` | `3000` | HTTP server port |
 
 ## Deployment
 
diff --git a/src/server.py b/src/server.py
index f4fd233..c8bc9e1 100755
--- a/src/server.py
+++ b/src/server.py
@@ -842,7 +842,7 @@ async def get_server_info(ctx: Context) -> dict:
 # ---------------------------------------------------------------------------
 
 if __name__ == "__main__":
-    port = int(os.environ.get("PORT", 8000))
+    port = int(os.environ.get("PORT", 3000))
     host = "0.0.0.0"
     logger.info("Starting poke-mail on %s:%d", host, port)
     mcp.run(transport="http", host=host, port=port, stateless_http=True)