diff --git a/PORT_MAP.md b/PORT_MAP.md
index 7d9d4dc..a1725cb 100644
--- a/PORT_MAP.md
+++ b/PORT_MAP.md
@@ -36,7 +36,7 @@ Rule of thumb: keep ports below 10000 free for stuff that reserves ports.
 | 20090       | matrix-media-repo    | prometheus metrics |
 | 21000       | pleroma              | pleroma |
 | 21010       | grafana              | grafana |
-| 22000       | gitea                | gitea |
+| 22000       | gitea                | forgejo |
 | 22010       | jenkins-ci           | Jenkins CI |
 | 22020       | travelynx            | Travelynx Web |
 | 22030       | octoprint            | OctoPrint Web Interface |
diff --git a/bundles/gitea/metadata.py b/bundles/gitea/metadata.py
index 6785b4b..7a69b32 100644
--- a/bundles/gitea/metadata.py
+++ b/bundles/gitea/metadata.py
@@ -6,7 +6,7 @@ defaults = {
         },
     },
     'gitea': {
-        'app_name': 'Gitea',
+        'app_name': 'Forgejo',
         'database': {
             'username': 'gitea',
             'password': repo.vault.password_for('{} postgresql gitea'.format(node.name)),
@@ -23,7 +23,7 @@ defaults = {
     'icinga2_api': {
         'gitea': {
             'services': {
-                'GITEA PROCESS': {
+                'FORGEJO PROCESS': {
                     'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_systemd_unit gitea',
                 },
             },
@@ -67,7 +67,7 @@ defaults = {
 
 
 @metadata_reactor.provides(
-    'nginx/vhosts/gitea',
+    'nginx/vhosts/forgejo',
 )
 def nginx(metadata):
     if not node.has_bundle('nginx'):
@@ -76,7 +76,7 @@ def nginx(metadata):
     return {
         'nginx': {
             'vhosts': {
-                'gitea': {
+                'forgejo': {
                     'domain': metadata.get('gitea/domain'),
                     'locations': {
                         '/': {
@@ -102,8 +102,7 @@ def icinga_check_for_new_release(metadata):
         'icinga2_api': {
             'gitea': {
                 'services': {
-                    'GITEA UPDATE': {
-                        # this is only temporary. We will switch to forgejo once they have their first stable release.
+                    'FORGEJO UPDATE': {
                         'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_forgejo_for_new_release codeberg.org forgejo/forgejo v{}'.format(metadata.get('gitea/version')),
                         'vars.notification.mail': True,
                         'check_interval': '60m',
diff --git a/nodes/rx300.py b/nodes/rx300.py
index ba7d3ef..996644a 100644
--- a/nodes/rx300.py
+++ b/nodes/rx300.py
@@ -327,7 +327,7 @@ nodes['rx300'] = {
             },
             'vhosts': {
                 'element-web': {'ssl': '_.franzi.business'},
-                'gitea': {'ssl': '_.franzi.business'},
+                'forgejo': {'ssl': '_.franzi.business'},
                 'jenkins-ci': {'ssl': '_.franzi.business'},
                 'matrix-dimension': {'ssl': '_.franzi.business'},
                 'matrix-synapse': {'ssl': '_.franzi.business'},