diff --git a/containers/gitea.fish b/containers/forgejo.fish
similarity index 79%
rename from containers/gitea.fish
rename to containers/forgejo.fish
index f587e4c..5273439 100755
--- a/containers/gitea.fish
+++ b/containers/forgejo.fish
@@ -1,6 +1,6 @@
 #!/usr/bin/env fish
 
-set -l container_name gitea
+set -l container_name forgejo
 set -l container_volumes_dir ~/volumes/$container_name
 
 podman-default-create \
@@ -9,4 +9,4 @@ podman-default-create \
     -p 2222:22 \
     -v $container_volumes_dir/data:/data:Z \
     --label "io.containers.autoupdate=registry" \
-    docker.io/gitea/gitea:latest
\ No newline at end of file
+    codeberg.org/forgejo/forgejo:1.18
\ No newline at end of file
diff --git a/volumes/traefik/dynamic.yml b/volumes/traefik/dynamic.yml
index c47b7db..1e203cc 100644
--- a/volumes/traefik/dynamic.yml
+++ b/volumes/traefik/dynamic.yml
@@ -47,11 +47,11 @@ http:
     to_advlabdb:
       rule: Host(`advlabdb.mo8it.com`)
       service: advlabdb
-    to_gitea:
+    to_forgejo:
       rule: Host(`git.mo8it.com`) || Host(`git.mo8it.xyz`)
       middlewares:
         - mo8it_xyz_to_com
-      service: gitea
+      service: forgejo
     to_nextcloud:
       rule: Host(`nextcloud.mo8it.com`) || Host(`nextcloud.mo8it.xyz`)
       middlewares:
@@ -101,10 +101,10 @@ http:
       loadBalancer:
         servers:
           - url: http://advlabdb-nginx
-    gitea:
+    forgejo:
       loadBalancer:
         servers:
-          - url: http://gitea:3000
+          - url: http://forgejo:3000
     nextcloud:
       loadBalancer:
         servers: