diff --git a/docker-compose/productivity/docker-compose.yml b/docker-compose/productivity/docker-compose.yml
index 56379c9..8b0d60d 100644
--- a/docker-compose/productivity/docker-compose.yml
+++ b/docker-compose/productivity/docker-compose.yml
@@ -39,7 +39,7 @@ services:
       - traefik-network
       - nextcloud-network
     ports:
-      - "8099:80"
+      - "8089:80"
     volumes:
       - ./nextcloud/html:/var/www/html
       - /mnt/nextcloud-data:/var/www/html/data  # Large data on separate drive
@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.nextcloud.tls.certresolver=letsencrypt"
       - "traefik.http.routers.nextcloud.middlewares=authelia@docker"
       # Service configuration
-      - "traefik.http.services.nextcloud.loadbalancer.server.port=8099"
+      - "traefik.http.services.nextcloud.loadbalancer.server.port=8089"
       # Sablier configuration
       - "sablier.enable=true"
       - "sablier.group=${SERVER_HOSTNAME}-nextcloud"
@@ -103,7 +103,7 @@ services:
       - homelab-network
       - traefik-network
     ports:
-      - "9001:9000"
+      - "9000:9000"
     volumes:
       - ./mealie/data:/app/data
     environment:
@@ -125,7 +125,7 @@ services:
       - "traefik.http.routers.mealie.tls.certresolver=letsencrypt"
       - "traefik.http.routers.mealie.middlewares=authelia@docker"
       # Service configuration
-      - "traefik.http.services.mealie.loadbalancer.server.port=9001"
+      - "traefik.http.services.mealie.loadbalancer.server.port=9000"
       # Sablier configuration
       - "sablier.enable=true"
       - "sablier.group=${SERVER_HOSTNAME}-mealie"
@@ -142,7 +142,7 @@ services:
       - traefik-network
       - wordpress-network
     ports:
-      - "8089:80"
+      - "8088:80"
     volumes:
       - ./wordpress/html:/var/www/html
     environment:
@@ -165,7 +165,7 @@ services:
       - "traefik.http.routers.wordpress.tls.certresolver=letsencrypt"
       - "traefik.http.routers.wordpress.middlewares=authelia@docker"
       # Service configuration
-      - "traefik.http.services.wordpress.loadbalancer.server.port=8089"
+      - "traefik.http.services.wordpress.loadbalancer.server.port=8088"
       # Sablier configuration
       - "sablier.enable=true"
       - "sablier.group=${SERVER_HOSTNAME}-wordpress"
@@ -208,7 +208,7 @@ services:
       - traefik-network
       - gitea-network
     ports:
-      - "3011:3000"
+      - "3010:3000"
     volumes:
       - ./gitea/data:/data
       - /etc/timezone:/etc/timezone:ro
@@ -236,7 +236,7 @@ services:
       - "traefik.http.routers.gitea.tls.certresolver=letsencrypt"
       - "traefik.http.routers.gitea.middlewares=authelia@docker"
       # Service configuration
-      - "traefik.http.services.gitea.loadbalancer.server.port=3011"
+      - "traefik.http.services.gitea.loadbalancer.server.port=3010"
       # Sablier configuration
       - "sablier.enable=true"
       - "sablier.group=${SERVER_HOSTNAME}-gitea"
@@ -269,7 +269,7 @@ services:
       - homelab-network
       - traefik-network
     ports:
-      - "6876:80"
+      - "8087:80"
     volumes:
       - ./dokuwiki/config:/config
     environment:
@@ -289,7 +289,7 @@ services:
       - "traefik.http.routers.dokuwiki.tls.certresolver=letsencrypt"
       - "traefik.http.routers.dokuwiki.middlewares=authelia@docker"
       # Service configuration
-      - "traefik.http.services.dokuwiki.loadbalancer.server.port=8088"
+      - "traefik.http.services.dokuwiki.loadbalancer.server.port=8087"
       # Sablier configuration
       - "sablier.enable=true"
       - "sablier.group=${SERVER_HOSTNAME}-dokuwiki"
@@ -307,7 +307,7 @@ services:
       - traefik-network
       - bookstack-network
     ports:
-      - "6876:80"
+      - "6875:80"
     volumes:
       - ./bookstack/config:/config
     environment:
@@ -335,7 +335,7 @@ services:
       - "traefik.http.routers.bookstack.tls.certresolver=letsencrypt"
       - "traefik.http.routers.bookstack.middlewares=authelia@docker"
       # Service configuration
-      - "traefik.http.services.bookstack.loadbalancer.server.port=6876"
+      - "traefik.http.services.bookstack.loadbalancer.server.port=6875"
       # Sablier configuration
       - "sablier.enable=true"
       - "sablier.group=${SERVER_HOSTNAME}-bookstack"
@@ -369,7 +369,7 @@ services:
       - traefik-network
       - mediawiki-network
     ports:
-      - "8891:80"
+      - "8084:80"
     volumes:
       - ./mediawiki/images:/var/www/html/images
       - ./mediawiki/LocalSettings.php:/var/www/html/LocalSettings.php
@@ -393,7 +393,7 @@ services:
       - "traefik.http.routers.mediawiki.tls.certresolver=letsencrypt"
       - "traefik.http.routers.mediawiki.middlewares=authelia@docker"
       # Service configuration
-      - "traefik.http.services.mediawiki.loadbalancer.server.port=8891"
+      - "traefik.http.services.mediawiki.loadbalancer.server.port=8084"
       # Sablier configuration
       - "sablier.enable=true"
       - "sablier.group=${SERVER_HOSTNAME}-mediawiki"