diff --git a/bundles/n8n/items.py b/bundles/n8n/items.py
index 31e6ca2..d0d6577 100644
--- a/bundles/n8n/items.py
+++ b/bundles/n8n/items.py
@@ -19,6 +19,15 @@ actions['install_n8n'] = {
         'user:n8n',
     },
     'triggers': {
-        'svc_systemd:n8n:restart',
+        'svc_systemd:n8n.service:restart',
+    },
+}
+
+svc_systemd['n8n.service'] = {
+    'enabled': True,
+    'running': True,
+    'needs': {
+        'pkg_apt:nodejs',
+        'action:install_n8n',
     },
 }
diff --git a/bundles/n8n/metadata.py b/bundles/n8n/metadata.py
index c7f60ea..bf967d5 100644
--- a/bundles/n8n/metadata.py
+++ b/bundles/n8n/metadata.py
@@ -1,13 +1,21 @@
+database_password = repo.vault.password_for(f'{node.name} postgresql n8n')
+
 defaults = {
     'backups': {
         'paths': {
             '/opt/n8n',
         },
     },
-    'users': {
-        'n8n': {
-            'home': '/opt/n8n',
-        },
+    'npm': {
+        'n8n': {},
+    },
+    'n8n': {
+        'DB_TYPE': 'postgresdb',
+        'DB_POSTGRESDB_DATABASE': 'n8n',
+        'DB_POSTGRESDB_HOST': 'localhost',
+        'DB_POSTGRESDB_PORT': 5432,
+        'DB_POSTGRESDB_USER': 'n8n',
+        'DB_POSTGRESDB_PASSWORD': database_password,
     },
     'postgresql': {
         'databases': {
@@ -17,18 +25,45 @@ defaults = {
                     'collation': 'C.UTF-8',
                     'ctype': 'C.UTF-8',
                 },
+                'owner': 'n8n',
             },
         },
         'roles': {
             'n8n': {
-                'password': repo.vault.password_for(f'{node.name} n8n psql'),
+                'password': database_password,
             },
         },
     },
+    'systemd': {
+        'units': {
+            'n8n.service': {
+                'Unit': {
+                    'Description': 'n8n',
+                    'Requires': 'network.target postgresql.service',
+                    'After': 'postgresql.service',
+                },
+                'Service': {
+                    'Restart': 'always',
+                    'RestartSec': '5',
+                    'WorkingDirectory': '/opt/n8n',
+                    'ExecStart': '/usr/bin/npx n8n start',
+                    'User': 'n8n',
+                    'Group': 'n8n',
+                    'Environment': {
+                        'NODE_ENV=production',
+                    },
+                },
+            },
+        },
+    },
+    'users': {
+        'n8n': {
+            'home': '/opt/n8n',
+        },
+    },
     'zfs': {
         'datasets': {
             'tank/n8n': {
-                'compression': 'on',
                 'mountpoint': '/opt/n8n',
                 'needed_by': {'directory:/opt/n8n'},
             },
@@ -38,51 +73,15 @@ defaults = {
 
 
 @metadata_reactor.provides(
-    'icinga2_api/n8n/services/N8N UPDATE',
-)
-def icinga_check_for_new_release(metadata):
-    return {
-        'icinga2_api': {
-            'n8n': {
-                'services': {
-                    'N8N UPDATE': {
-                        'command_on_monitored_host':
-                            f'/usr/local/share/icinga/plugins/check_github_for_new_release '
-                            f'--repo n8n-io/n8n --current-version n8n@{metadata.get("n8n/version")}',
-                        'check_interval': '60m',
-                    },
-                },
-            },
-        },
-    }
-
-
-@metadata_reactor.provides(
-    'systemd/services/n8n',
+    'systemd/services/n8n.service',
 )
 def systemd(metadata):
     return {
         'systemd': {
-            'services': {
-                'n8n': {
-                    'content': {
-                        'Unit': {
-                            'Description': 'n8n',
-                            'Requires': 'network.target postgresql.service',
-                            'After': 'postgresql.service',
-                        },
-                        'Service': {
-                            'Restart': 'always',
-                            'RestartSec': '5',
-                            'WorkingDirectory': '/opt/n8n',
-                            'ExecStart': '/usr/bin/npx n8n start',
-                            'User': 'n8n',
-                            'Group': 'n8n',
-                        },
-                    },
-                    'env_as_file': metadata.get('n8n/env'),
-                    'needs': {
-                        'action:install_n8n',
+            'units': {
+                'n8n.service': {
+                    'Service': {
+                        'Environment': metadata.get('n8n'),
                     },
                 },
             },
diff --git a/bundles/nodejs/metadata.py b/bundles/nodejs/metadata.py
index f59fc27..4fed45e 100644
--- a/bundles/nodejs/metadata.py
+++ b/bundles/nodejs/metadata.py
@@ -8,9 +8,7 @@ defaults = {
             },
         },
     },
-    'npm': {
-        'yarn': {},
-    },
+    'npm': {},
 }
 
 
@@ -28,7 +26,9 @@ def sources(metadata):
                         'deb',
                         'deb-src',
                     },
-                    'url': 'https://deb.nodesource.com/node_{version}.x',
+                    'urls': {
+                        f'https://deb.nodesource.com/node_{version}.x',
+                    },
                     'suites': {
                         '{codename}',
                     },
diff --git a/nodes/mseibert.n8n.py b/nodes/mseibert.n8n.py
index 384cf06..cad28cc 100644
--- a/nodes/mseibert.n8n.py
+++ b/nodes/mseibert.n8n.py
@@ -11,10 +11,11 @@
         'webserver',
     ],
     'bundles': [
-        #'n8n',
-        #'nodejs',
+        'n8n',
+        'nodejs',
         'wireguard',
         'zfs',
+        'postgresql',
     ],
     'metadata': {
         'id': '4852308e-9d36-4a0e-b533-a291e1495db3',
@@ -31,6 +32,12 @@
                 'gateway6': 'fe80::1',
             },
         },
+        'n8n': {
+            'version': '1.68.0',
+        },
+        'nodejs': {
+            'version': '20',
+        },
         'vm': {
             'cores': 2,
             'ram': 4096,