diff --git a/Makefile b/Makefile
index f4125f9..712a684 100644
--- a/Makefile
+++ b/Makefile
@@ -11,26 +11,24 @@
 #//                                                          //
 #//////////////////////////////////////////////////////////////
 
-ADMIN_SERVICES := openssh 
-#uptime-kuma yacht
-#BLOG_SERVICES := wordpress
+ADMIN_SERVICES := openssh uptime-kuma yacht
+BLOG_SERVICES := wordpress
 #7DAYS_TO_DIE_SERVICES := 7daystodie_server 7daystodie_backup
 #MINECRAFT_SERVICES := minecraft_server minecraft_backup
 #SATISFACTORY_SERVICES := satisfactory_server satisfactory_backup
-#GIT_SERVICES := forgejo forgejo-runner
+GIT_SERVICES := forgejo
+# forgejo-runner
 # gitea gitea-runner
-#IA_SERVICES := open-webui
-#SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing
-#TORRENTS_SERVICES := qbittorrent transmission
-#UTILS_SERVICES := it-tools stirlingpdf omni-tools
-
+IA_SERVICES := open-webui
+SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing
+TORRENTS_SERVICES := qbittorrent transmission
+UTILS_SERVICES := it-tools stirlingpdf omni-tools
 MAIN_SERVICES := main_infrastructure caddy homepage
 
 PROJECT_DIRECTORY := infrastructure
 
-DOCKER_PROFILES := $(MAIN_SERVICES) \
-	$(ADMIN_SERVICES) $(BLOG_SERVICES) $(7DAYS_TO_DIE_SERVICES) $(MINECRAFT_SERVICES) \
-	$(SATISFACTORY_SERVICES) \
+DOCKER_PROFILES := $(MAIN_SERVICES) $(ADMIN_SERVICES) $(BLOG_SERVICES) \
+	$(7DAYS_TO_DIE_SERVICES) $(MINECRAFT_SERVICES) $(SATISFACTORY_SERVICES) \
 	$(GIT_SERVICES) $(IA_SERVICES) $(SHARING_SERVICES) \
 	$(TORRENTS_SERVICES) $(UTILS_SERVICES)
 
diff --git a/infrastructure/services/caddy/config/website/dufs.caddy b/infrastructure/services/caddy/config/website/dufs.caddy
index 1684fba..e7f469e 100644
--- a/infrastructure/services/caddy/config/website/dufs.caddy
+++ b/infrastructure/services/caddy/config/website/dufs.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 dufs.{$MAIN_DOMAIN} {
 	reverse_proxy dufs:5000
 }
diff --git a/infrastructure/services/caddy/config/website/forgejo.caddy b/infrastructure/services/caddy/config/website/forgejo.caddy
index 7732ad7..2a797d7 100644
--- a/infrastructure/services/caddy/config/website/forgejo.caddy
+++ b/infrastructure/services/caddy/config/website/forgejo.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 git.{$MAIN_DOMAIN} {
 	reverse_proxy forgejo:3000
 }
diff --git a/infrastructure/services/caddy/config/website/gitea.caddy b/infrastructure/services/caddy/config/website/gitea.caddy
index 4dac03a..16f1d23 100644
--- a/infrastructure/services/caddy/config/website/gitea.caddy
+++ b/infrastructure/services/caddy/config/website/gitea.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 gitea.{$MAIN_DOMAIN} {
 	reverse_proxy gitea:3000
 }
diff --git a/infrastructure/services/caddy/config/website/homepage.caddy b/infrastructure/services/caddy/config/website/homepage.caddy
index f779d2e..0857493 100644
--- a/infrastructure/services/caddy/config/website/homepage.caddy
+++ b/infrastructure/services/caddy/config/website/homepage.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 homepage.{$MAIN_DOMAIN} {
-	redir reverse_proxy homepage:3000
+	reverse_proxy homepage:3000
 }
diff --git a/infrastructure/services/caddy/config/website/it-tools.caddy b/infrastructure/services/caddy/config/website/it-tools.caddy
index 1b8f2e3..fd2d8b7 100644
--- a/infrastructure/services/caddy/config/website/it-tools.caddy
+++ b/infrastructure/services/caddy/config/website/it-tools.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 it-tools.{$MAIN_DOMAIN} {
 	# Load balance between 2 instances
 	reverse_proxy {
diff --git a/infrastructure/services/caddy/config/website/jellyfin.caddy b/infrastructure/services/caddy/config/website/jellyfin.caddy
index e442667..b48e9ba 100644
--- a/infrastructure/services/caddy/config/website/jellyfin.caddy
+++ b/infrastructure/services/caddy/config/website/jellyfin.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 jellyfin.{$MAIN_DOMAIN} {
 	reverse_proxy jellyfin:8096
 }
diff --git a/infrastructure/services/caddy/config/website/main.caddy b/infrastructure/services/caddy/config/website/main.caddy
index e4928c1..de05cf5 100644
--- a/infrastructure/services/caddy/config/website/main.caddy
+++ b/infrastructure/services/caddy/config/website/main.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 www.{$MAIN_DOMAIN} {
 	header {
 		Cache-Control "public, max-age=10"
diff --git a/infrastructure/services/caddy/config/website/memos.caddy b/infrastructure/services/caddy/config/website/memos.caddy
index cdc42a7..c02d644 100644
--- a/infrastructure/services/caddy/config/website/memos.caddy
+++ b/infrastructure/services/caddy/config/website/memos.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 memos.{$MAIN_DOMAIN} {
 	reverse_proxy memos:5230
 }
diff --git a/infrastructure/services/caddy/config/website/omni-tools.caddy b/infrastructure/services/caddy/config/website/omni-tools.caddy
index 97890c4..8fff24b 100644
--- a/infrastructure/services/caddy/config/website/omni-tools.caddy
+++ b/infrastructure/services/caddy/config/website/omni-tools.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 omni-tools.{$MAIN_DOMAIN} {
 	# Load balance between 2 instances
 	reverse_proxy {
diff --git a/infrastructure/services/caddy/config/website/open-webui.caddy b/infrastructure/services/caddy/config/website/open-webui.caddy
index 6082023..58ec45a 100644
--- a/infrastructure/services/caddy/config/website/open-webui.caddy
+++ b/infrastructure/services/caddy/config/website/open-webui.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 open-webui.{$MAIN_DOMAIN} {
 	reverse_proxy open-webui:8080
 }
diff --git a/infrastructure/services/caddy/config/website/picoshare.caddy b/infrastructure/services/caddy/config/website/picoshare.caddy
index f0f9890..f47d73d 100644
--- a/infrastructure/services/caddy/config/website/picoshare.caddy
+++ b/infrastructure/services/caddy/config/website/picoshare.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 picoshare.{$MAIN_DOMAIN} {
 	reverse_proxy picoshare:4001
 }
diff --git a/infrastructure/services/caddy/config/website/privatebin.caddy b/infrastructure/services/caddy/config/website/privatebin.caddy
index 520f490..ed8d5c5 100644
--- a/infrastructure/services/caddy/config/website/privatebin.caddy
+++ b/infrastructure/services/caddy/config/website/privatebin.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 privatebin.{$MAIN_DOMAIN} {
 	reverse_proxy privatebin:8080
 }
diff --git a/infrastructure/services/caddy/config/website/projectsend.caddy b/infrastructure/services/caddy/config/website/projectsend.caddy
index 9289eec..0f12274 100644
--- a/infrastructure/services/caddy/config/website/projectsend.caddy
+++ b/infrastructure/services/caddy/config/website/projectsend.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 projectsend.{$MAIN_DOMAIN} {
 	reverse_proxy projectsend:80
 }
diff --git a/infrastructure/services/caddy/config/website/psitransfer.caddy b/infrastructure/services/caddy/config/website/psitransfer.caddy
index f9ccf9c..3bbd894 100644
--- a/infrastructure/services/caddy/config/website/psitransfer.caddy
+++ b/infrastructure/services/caddy/config/website/psitransfer.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 transfer.{$MAIN_DOMAIN} {
 	reverse_proxy psitransfer:3000
 }
diff --git a/infrastructure/services/caddy/config/website/qbittorrent.caddy b/infrastructure/services/caddy/config/website/qbittorrent.caddy
index b9f4533..0cb6c83 100644
--- a/infrastructure/services/caddy/config/website/qbittorrent.caddy
+++ b/infrastructure/services/caddy/config/website/qbittorrent.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 torrent.{$MAIN_DOMAIN} {
 	reverse_proxy qbittorrent:8080
 }
diff --git a/infrastructure/services/caddy/config/website/stirlingpdf.caddy b/infrastructure/services/caddy/config/website/stirlingpdf.caddy
index cc78412..4b401ec 100644
--- a/infrastructure/services/caddy/config/website/stirlingpdf.caddy
+++ b/infrastructure/services/caddy/config/website/stirlingpdf.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 stirlingpdf.{$MAIN_DOMAIN} {
 	reverse_proxy stirlingpdf:8080
 }
diff --git a/infrastructure/services/caddy/config/website/syncthing.caddy b/infrastructure/services/caddy/config/website/syncthing.caddy
index cfcd1fa..c6ea431 100644
--- a/infrastructure/services/caddy/config/website/syncthing.caddy
+++ b/infrastructure/services/caddy/config/website/syncthing.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 syncthing.{$MAIN_DOMAIN} {
 	reverse_proxy syncthing:8384 {
 		header_up Host {upstream_hostport}
diff --git a/infrastructure/services/caddy/config/website/transmission.caddy b/infrastructure/services/caddy/config/website/transmission.caddy
index 1cc2ad9..c15a44f 100644
--- a/infrastructure/services/caddy/config/website/transmission.caddy
+++ b/infrastructure/services/caddy/config/website/transmission.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 transmission.{$MAIN_DOMAIN} {
 	reverse_proxy transmission:9091
 }
diff --git a/infrastructure/services/caddy/config/website/uptimekuma.caddy b/infrastructure/services/caddy/config/website/uptimekuma.caddy
index f3c5462..809df01 100644
--- a/infrastructure/services/caddy/config/website/uptimekuma.caddy
+++ b/infrastructure/services/caddy/config/website/uptimekuma.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 uptimekuma.{$MAIN_DOMAIN} {
 	reverse_proxy uptime-kuma:3001
 }
diff --git a/infrastructure/services/caddy/config/website/wordpress.caddy b/infrastructure/services/caddy/config/website/wordpress.caddy
index 68e00ce..0a9169f 100644
--- a/infrastructure/services/caddy/config/website/wordpress.caddy
+++ b/infrastructure/services/caddy/config/website/wordpress.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 wordpress.{$MAIN_DOMAIN} {
 	root * /var/www/html
 	php_fastcgi wordpress:9000
diff --git a/infrastructure/services/caddy/config/website/yacht.caddy b/infrastructure/services/caddy/config/website/yacht.caddy
index 1dadc3e..0054b9f 100644
--- a/infrastructure/services/caddy/config/website/yacht.caddy
+++ b/infrastructure/services/caddy/config/website/yacht.caddy
@@ -1,5 +1,3 @@
-import header.caddy
-
 yacht.{$MAIN_DOMAIN} {
 	reverse_proxy yacht:8000
 }
diff --git a/infrastructure/services/forgejo/docker-compose.forgejo.yml b/infrastructure/services/forgejo/docker-compose.forgejo.yml
index daf658b..a08dc09 100644
--- a/infrastructure/services/forgejo/docker-compose.forgejo.yml
+++ b/infrastructure/services/forgejo/docker-compose.forgejo.yml
@@ -63,7 +63,7 @@ services:
     networks:
       - infra-network
     profiles:
-      - forgejo
+      - forgejo-runner
     links:
       - docker-in-docker
     depends_on:
diff --git a/infrastructure/services/minecraft-server b/infrastructure/services/minecraft-server
index 94be77f..d950957 160000
--- a/infrastructure/services/minecraft-server
+++ b/infrastructure/services/minecraft-server
@@ -1 +1 @@
-Subproject commit 94be77f9a7e217e6566173d5da07ca58445e14c1
+Subproject commit d9509579caa419fc5017d9819968d3531fabd38d
diff --git a/tools/docker_volumes_export.sh b/tools/docker_volumes_export.sh
index 378e1ad..b8fe96b 100755
--- a/tools/docker_volumes_export.sh
+++ b/tools/docker_volumes_export.sh
@@ -51,6 +51,11 @@ volumes=(
     gitea_data
     jellyfin_config
     picoshare_data
+    forgejo_data
+    forgejo_config
+    forgejo_db
+    forgejo_certs
+    forgejo_runner
 )
 
 export_volume() {