diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 109758a..0b38d71 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -7,9 +7,9 @@ infra.arcbjorn.com {
 }
 
 db.arcbjorn.com {
-  reverse_proxy pgadmin:7000
+  reverse_proxy pgadmin:80
 }
 
 git.arcbjorn.com {
-  reverse_proxy gitea:8070
+  reverse_proxy gitea:3000
 }
\ No newline at end of file
diff --git a/caddy/docker-compose.yaml b/caddy/docker-compose.yaml
index f782384..9244015 100644
--- a/caddy/docker-compose.yaml
+++ b/caddy/docker-compose.yaml
@@ -11,23 +11,23 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /root/containers/portainer/portainer-data:/data
-    networks:
-      - caddy-network
     ports:
       - 9000:9000
+    networks:
+      - caddy-network
 
   caddy:
     image: caddy:latest
     restart: unless-stopped
     container_name: caddy
-    ports:
-      - 80:80
-      - 443:443
     volumes:
       - /root/containers/caddy/Caddyfile:/etc/caddy/Caddyfile
       - /root/containers/caddy/site:/srv
       - /root/containers/caddy/caddy_data:/data
       - /root/containers/caddy/caddy_config:/config
+    ports:
+      - 80:80
+      - 443:443
     networks:
       - caddy-network
 
diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml
index 76bbcfa..4f3269b 100644
--- a/gitea/docker-compose.yaml
+++ b/gitea/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.9"
 
 services:
-  server:
+  gitea:
     image: gitea/gitea:latest
     container_name: gitea
 
@@ -18,12 +18,12 @@ services:
       - /root/containers/gitea/data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "${GIT_UI_PORT}:3000"
+      - "${GIT_PORT}:22"
     networks:
       - postgresql-network
       - caddy-network
-    ports:
-      - "${GIT_PORT}:3000"
-      - "222:22"
 
 volumes:
   gitea: