diff --git a/Makefile b/Makefile
index 08a9312..aefe2f7 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,7 @@ help:
 	@echo "  make dev-auth     - Start core infrastructure + Zitadel auth"
 	@echo "  make dev-full-auth     - Start core infrastructure + observability + Zitadel auth"
 	@echo "  make dev-gateway  - Start core infrastructure + gateway ingress (NGINX + gateway service)"
+	@echo "  make dev-all      - Start full development environment (core infrastructure + observability + Zitadel auth + gateway ingress + frontend)"
 	@echo "  make stop         - Stop all containers"
 	@echo "  make clean        - Stop containers and remove volumes"
 	@echo "  make infra-build-images - Build all production service images via compose"
@@ -134,6 +135,9 @@ dev-gateway: dev
 	@echo "Gateway ingress ready:"
 	@echo "  Public entrypoint (NGINX): http://localhost:$(GATEWAY_PORT)"
 
+dev-all: dev-full-auth dev-gateway frontend-dev
+	@echo "Open http://localhost:5173 to access the application frontend (via gateway ingress)."
+
 stop:
 	@echo "Stopping all containers..."
 	@$(COMPOSE_CMD) down
diff --git a/infrastructure/dev/.env.example b/infrastructure/dev/.env.example
index 3b76bc7..0c625a9 100644
--- a/infrastructure/dev/.env.example
+++ b/infrastructure/dev/.env.example
@@ -13,7 +13,7 @@ REDIS_PORT=6379
 ZITADEL_URL=http://localhost:8080
 ZITADEL_PROJECT_ID=your-project-id
 ZITADEL_CLIENT_ID=your-client-id
-ZITADEL_PORT=8084
+ZITADEL_PORT=8080
 ZITADEL_MASTERKEY=replace-with-32-char-masterkey
 ZITADEL_ORG_NAME=knowfoolery
 ZITADEL_ADMIN_USERNAME=admin
@@ -28,10 +28,10 @@ ENVIRONMENT=development
 LOG_LEVEL=debug
 
 # Service Ports
-GAME_SESSION_PORT=8080
-QUESTION_BANK_PORT=8081
-USER_SERVICE_PORT=8082
-LEADERBOARD_PORT=8083
+GAME_SESSION_PORT=8081
+QUESTION_BANK_PORT=8082
+USER_SERVICE_PORT=8083
+LEADERBOARD_PORT=8084
 ADMIN_SERVICE_PORT=8085
 GATEWAY_PORT=8086
 GATEWAY_INTERNAL_PORT=18086