diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7c67de7..ff7cbb7 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -22,7 +22,7 @@ services:
       - POSTGRES_PASSWORD=password
 
   forgejo:
-    image: forgejo/forgejo:1.18.0-rc1-1
+    image: codeberg.org/forgejo/forgejo:1.18.0-1
     container_name: hostea-dash-forgejo
 
   smtp:
diff --git a/docker-compose-dev-deps.yml b/docker-compose-dev-deps.yml
index d9abbf7..f57be09 100644
--- a/docker-compose-dev-deps.yml
+++ b/docker-compose-dev-deps.yml
@@ -9,7 +9,7 @@ version: "3"
 
 services:
   forgejo:
-    image: forgejo/forgejo:1.18.0-rc1-1
+    image: codeberg.org/forgejo/forgejo:1.18.0-1
     container_name: hostea-dash-forgejo
     network_mode: host
     environment:
diff --git a/infrastructure/templates/infrastructure/yml/forgejo.yml b/infrastructure/templates/infrastructure/yml/forgejo.yml
index 768f069..677c135 100644
--- a/infrastructure/templates/infrastructure/yml/forgejo.yml
+++ b/infrastructure/templates/infrastructure/yml/forgejo.yml
@@ -26,7 +26,7 @@ forgejo_ssh_port: "22"
 # Forgejo version
 #
 #
-#forgejo_version: "1.18.0-rc1-1"
+#forgejo_version: "1.18.0-1"
 #
 #######################################
 #