diff --git a/bundles/forgejo/items.py b/bundles/forgejo/items.py
index e3ed9b1..f94c360 100644
--- a/bundles/forgejo/items.py
+++ b/bundles/forgejo/items.py
@@ -37,7 +37,7 @@ files = {
     },
     '/usr/local/bin/forgejo': {
         'content_type': 'download',
-        'source': node.metadata.get('forgejo/url'),
+        'source': 'https://codeberg.org/forgejo/forgejo/releases/download/v{0}/forgejo-{0}-linux-amd64'.format(node.metadata.get('forgejo/version')),
         'content_hash': node.metadata.get('forgejo/sha1', None),
         'mode': '0755',
         'triggers': {
diff --git a/bundles/forgejo/metadata.py b/bundles/forgejo/metadata.py
index 7eb43ec..714568f 100644
--- a/bundles/forgejo/metadata.py
+++ b/bundles/forgejo/metadata.py
@@ -26,7 +26,6 @@ defaults = {
                     'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_systemd_unit forgejo',
                 },
                 'FORGEJO UPDATE': {
-                    'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_forgejo_for_new_release codeberg.org forgejo/forgejo v$(forgejo --version | cut -d" " -f3 | sed "s/\\+/\\-/g")',
                     'vars.notification.mail': True,
                     'check_interval': '60m',
                 },
@@ -63,6 +62,23 @@ defaults = {
 }
 
 
+@metadata_reactor.provides(
+    'icinga2_api/forgejo',
+)
+def update_monitoring(metadata):
+    return {
+        'icinga2_api': {
+            'forgejo': {
+                'services': {
+                    'FORGEJO UPDATE': {
+                        'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_forgejo_for_new_release codeberg.org forgejo/forgejo v{}'.format(metadata.get('forgejo/version')),
+                    },
+                },
+            },
+        },
+    }
+
+
 @metadata_reactor.provides(
     'nginx/vhosts/forgejo',
 )
diff --git a/nodes/carlene.toml b/nodes/carlene.toml
index d2a692b..0501f3b 100644
--- a/nodes/carlene.toml
+++ b/nodes/carlene.toml
@@ -48,8 +48,8 @@ defaultCountryCode = "DE"
 jitsi.preferredDomain = "meet.ffmuc.net"
 
 [metadata.forgejo]
-url = "https://codeberg.org/forgejo/forgejo/releases/download/v1.20.3-0/forgejo-1.20.3-0-linux-amd64"
-sha1 = "3199c656c9b9916f288d5feadcf0b63f6bbe1193"
+version = "1.20.4-0"
+sha1 = "20994ac3f10a7c6af11743b19bcea33107a49b35"
 domain = "git.franzi.business"
 enable_git_hooks = true
 install_ssh_key = true