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/migrations/0002_instancecreated_forgejo_password.py b/infrastructure/migrations/0002_instancecreated_gitea_password.py
similarity index 92%
rename from infrastructure/migrations/0002_instancecreated_forgejo_password.py
rename to infrastructure/migrations/0002_instancecreated_gitea_password.py
index e0dcf5f..0777dbd 100644
--- a/infrastructure/migrations/0002_instancecreated_forgejo_password.py
+++ b/infrastructure/migrations/0002_instancecreated_gitea_password.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name="instancecreated",
-            name="forgejo_password",
+            name="gitea_password",
             field=models.CharField(
                 default=None, max_length=32, verbose_name="Name of this configuration"
             ),
diff --git a/infrastructure/migrations/0003_rename_creted_instancecreated_created.py b/infrastructure/migrations/0003_rename_creted_instancecreated_created.py
index f50b898..3fcb19a 100644
--- a/infrastructure/migrations/0003_rename_creted_instancecreated_created.py
+++ b/infrastructure/migrations/0003_rename_creted_instancecreated_created.py
@@ -6,7 +6,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("infrastructure", "0002_instancecreated_forgejo_password"),
+        ("infrastructure", "0002_instancecreated_gitea_password"),
     ]
 
     operations = [
diff --git a/infrastructure/migrations/0004_alter_instancecreated_forgejo_password.py b/infrastructure/migrations/0004_alter_instancecreated_gitea_password.py
similarity index 81%
rename from infrastructure/migrations/0004_alter_instancecreated_forgejo_password.py
rename to infrastructure/migrations/0004_alter_instancecreated_gitea_password.py
index e592971..992f662 100644
--- a/infrastructure/migrations/0004_alter_instancecreated_forgejo_password.py
+++ b/infrastructure/migrations/0004_alter_instancecreated_gitea_password.py
@@ -12,11 +12,11 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterField(
             model_name="instancecreated",
-            name="forgejo_password",
+            name="gitea_password",
             field=models.CharField(
                 default=None,
                 max_length=32,
-                verbose_name="Forgejo password of this deployment",
+                verbose_name="Gitea password of this deployment",
             ),
         ),
     ]
diff --git a/infrastructure/migrations/0005_remove_instancecreated_forgejo_password.py b/infrastructure/migrations/0005_remove_instancecreated_gitea_password.py
similarity index 70%
rename from infrastructure/migrations/0005_remove_instancecreated_forgejo_password.py
rename to infrastructure/migrations/0005_remove_instancecreated_gitea_password.py
index 6659d1e..6185e3a 100644
--- a/infrastructure/migrations/0005_remove_instancecreated_forgejo_password.py
+++ b/infrastructure/migrations/0005_remove_instancecreated_gitea_password.py
@@ -6,12 +6,12 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("infrastructure", "0004_alter_instancecreated_forgejo_password"),
+        ("infrastructure", "0004_alter_instancecreated_gitea_password"),
     ]
 
     operations = [
         migrations.RemoveField(
             model_name="instancecreated",
-            name="forgejo_password",
+            name="gitea_password",
         ),
     ]
diff --git a/infrastructure/migrations/0006_job.py b/infrastructure/migrations/0006_job.py
index b4bfe9d..4561f62 100644
--- a/infrastructure/migrations/0006_job.py
+++ b/infrastructure/migrations/0006_job.py
@@ -8,7 +8,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("dash", "0006_auto_20220619_0800"),
-        ("infrastructure", "0005_remove_instancecreated_forgejo_password"),
+        ("infrastructure", "0005_remove_instancecreated_gitea_password"),
     ]
 
     operations = [
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"
 #
 #######################################
 #
diff --git a/requirements.txt b/requirements.txt
index bb351ab..8da035c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ django-oauth-toolkit==2.0.0
 django-payments==1.0.0
 django-phonenumber-field==6.3.0
 djangorestframework==3.13.1
-greenlet==1.1.2
+greenlet==1.1.3.post0
 idna==3.3
 install==1.3.5
 isort==5.10.1