diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml
new file mode 100644
index 0000000..61d461a
--- /dev/null
+++ b/docker/forgejo/docker-compose.toml
@@ -0,0 +1,26 @@
+[services.forgejo]
+image = "codeberg.org/forgejo/forgejo:1.18.0-rc1-1"
+container_name = "forgejo"
+environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"]
+restart = "unless-stopped"
+networks = ["postgres", "proxy"]
+ports = ["3000:3000", "22:22"]
+volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"]
+labels = [
+  "traefik.enable=true",
+  "traefik.docker.network=proxy",
+  "traefik.http.routers.forgejo-redirect.entrypoints=http",
+  "traefik.http.routers.forgejo-redirect.rule=Host(`git.korhonen.cc`)",
+  "traefik.http.routers.forgejo-redirect.middlewares=http2https@file",
+  "traefik.http.routers.forgejo.entrypoints=https",
+  "traefik.http.routers.forgejo.middlewares=secHeaders@file,compress@file",
+  "traefik.http.routers.forgejo.rule=Host(`git.korhonen.cc`)",
+  "traefik.http.routers.forgejo.service=forgejo",
+  "traefik.http.services.forgejo.loadbalancer.server.port=3000",
+]
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true
diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml
deleted file mode 100644
index 9ed7268..0000000
--- a/docker/gitea/docker-compose.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[services.gitea]
-image = "functionalhacker/gitea-asciidoc"
-container_name = "gitea"
-environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"]
-restart = "unless-stopped"
-networks = ["postgres", "proxy"]
-ports = ["3000:3000", "22:22"]
-volumes = ["/docker/gitea:/data", "/etc/localtime:/etc/localtime:ro"]
-labels = [
-  "traefik.enable=true",
-  "traefik.docker.network=proxy",
-  "traefik.http.routers.gitea-redirect.entrypoints=http",
-  "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)",
-  "traefik.http.routers.gitea-redirect.middlewares=http2https@file",
-  "traefik.http.routers.gitea.entrypoints=https",
-  "traefik.http.routers.gitea.middlewares=secHeaders@file,compress@file",
-  "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)",
-  "traefik.http.routers.gitea.service=gitea",
-  "traefik.http.services.gitea.loadbalancer.server.port=3000",
-]
-
-[networks.postgres]
-external = true
-
-[networks.proxy]
-external = true