diff --git a/compose/git.runner.yml b/compose/act.yml
similarity index 100%
rename from compose/git.runner.yml
rename to compose/act.yml
diff --git a/compose/castopod.yml b/compose/castopod.yml
new file mode 100644
index 0000000..ac5b064
--- /dev/null
+++ b/compose/castopod.yml
@@ -0,0 +1,34 @@
+services:
+  castopod:
+    image: castopod/castopod:latest
+    volumes:
+      - ${ROOT_DIR}/castopod-media:/var/www/castopod/public/media
+    environment:
+      MYSQL_DATABASE: castopod
+      MYSQL_USER: castopod
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+      CP_BASEURL: "https://castopod.example.com"
+      CP_ANALYTICS_SALT: ${ANALYTICS_SALT}
+      CP_CACHE_HANDLER: redis
+      CP_REDIS_HOST: redis
+      CP_REDIS_PASSWORD: ${REDIS_PASSWORD}
+    ports:
+      - 8000:8000
+    restart: unless-stopped
+ 
+  mariadb:
+    image: mariadb:11.2
+    volumes:
+      - ${ROOT_DIR}/castopod-db:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
+      MYSQL_DATABASE: castopod
+      MYSQL_USER: castopod
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+    restart: unless-stopped
+ 
+  redis:
+    image: redis:7.2-alpine
+    command: --requirepass ${REDIS_PASSWORD}
+    volumes:
+      - ${ROOT_DIR}/castopod-cache:/data
\ No newline at end of file
diff --git a/compose/docuseal.yml b/compose/docuseal.yml
index 9ee3388..0781fab 100644
--- a/compose/docuseal.yml
+++ b/compose/docuseal.yml
@@ -5,7 +5,7 @@ services:
         condition: service_healthy
     image: docuseal/docuseal:latest
     ports:
-      - '3069:3000'
+      - '${APP_PORT}:3000'
     environment:
       DATABASE_URL: postgresql://postgres:postgres@postgres:5432/docuseal
       ROOT_DIR: ${ROOT_DIR}
diff --git a/compose/draw.yml b/compose/excalidraw.yml
similarity index 82%
rename from compose/draw.yml
rename to compose/excalidraw.yml
index 149c12a..5e04056 100644
--- a/compose/draw.yml
+++ b/compose/excalidraw.yml
@@ -2,5 +2,5 @@ services:
   excalidraw:
     image: docker.io/excalidraw/excalidraw:latest
     ports:
-      - 8182:80
+      - ${APP_PORT}:80
     restart: unless-stopped
\ No newline at end of file
diff --git a/compose/git.yml b/compose/forgejo.yml
similarity index 94%
rename from compose/git.yml
rename to compose/forgejo.yml
index 08d9dd9..101c62c 100644
--- a/compose/git.yml
+++ b/compose/forgejo.yml
@@ -7,8 +7,6 @@ services:
       POSTGRES_DB: forgejo
     volumes:
       - ${ROOT_DIR}/postgres_data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
 
   server:
     image: codeberg.org/forgejo/forgejo:9
@@ -33,5 +31,5 @@ services:
     volumes:
       - ${ROOT_DIR}/forgejo_data:/data
     ports:
-      - '8080:3000'
-      - '69:22'
\ No newline at end of file
+      - '${APP_PORT}:3000'
+      - '${SSH_PORT}:22'
\ No newline at end of file
diff --git a/compose/masto.yml b/compose/gotosocial.yml
similarity index 92%
rename from compose/masto.yml
rename to compose/gotosocial.yml
index c396734..a558e03 100644
--- a/compose/masto.yml
+++ b/compose/gotosocial.yml
@@ -8,7 +8,7 @@ services:
       GTS_LETSENCRYPT_ENABLED: "false"
       GTS_LETSENCRYPT_EMAIL_ADDRESS: ""
     ports:
-      - "8181:8080"
+      - "${APP_PORT}:8080"
     volumes:
       - ${ROOT_DIR}:/data
     restart: "always"
\ No newline at end of file
diff --git a/compose/s3.yml b/compose/minio.yml
similarity index 82%
rename from compose/s3.yml
rename to compose/minio.yml
index 97ca313..7939597 100644
--- a/compose/s3.yml
+++ b/compose/minio.yml
@@ -8,5 +8,5 @@ services:
     volumes:
       - ${ROOT_DIR}:/data
     ports:
-      - 9000:9000
-      - 9001:9001
\ No newline at end of file
+      - ${S3_PORT}:9000
+      - ${CONSOLE_PORT}:9001
\ No newline at end of file
diff --git a/compose/nginx.yml b/compose/nginx.yml
index 0064402..d51c77b 100644
--- a/compose/nginx.yml
+++ b/compose/nginx.yml
@@ -6,7 +6,6 @@ services:
       - "80:80" # Public HTTP Port
       - "443:443" # Public HTTPS Port
       - "81:81" # Admin Web Port
-      - "25565-25569:25565-25569" #Minecraft Ports
     networks:
       - proxy
     volumes:
diff --git a/compose/gist.yml b/compose/opengist.yml
similarity index 85%
rename from compose/gist.yml
rename to compose/opengist.yml
index 8b47d14..701a7d1 100644
--- a/compose/gist.yml
+++ b/compose/opengist.yml
@@ -3,8 +3,8 @@ services:
     image: ghcr.io/thomiceli/opengist:1
     restart: unless-stopped
     ports:
-      - "6157:6157"
-      - "420:2222"
+      - "${APP_PORT}:6157"
+      - "${SSH_PORT}:2222"
     volumes:
       - ${ROOT_DIR}:/opengist
     environment:
diff --git a/compose/vault.yml b/compose/vaultwarden.yml
similarity index 95%
rename from compose/vault.yml
rename to compose/vaultwarden.yml
index 889bede..17467a5 100644
--- a/compose/vault.yml
+++ b/compose/vaultwarden.yml
@@ -6,7 +6,7 @@ services:
     image: vaultwarden/server:latest
     restart: unless-stopped
     ports:
-     - '9445:80'
+     - '${APP_PORT}:80'
     environment:
       ADMIN_TOKEN: ${ADMIN_TOKEN}
       WEBSOCKET_ENABLED: true