diff --git a/bundles/users/metadata.py b/bundles/users/metadata.py
index 10c4162..030cdbb 100644
--- a/bundles/users/metadata.py
+++ b/bundles/users/metadata.py
@@ -51,7 +51,7 @@ def user(metadata):
             
         if not 'privkey' in users[name] and not 'pubkey' in users[name]:
             privkey, pubkey = repo.libs.ssh.generate_ed25519_key_pair(
-                b64decode(str(repo.vault.random_bytes_as_base64_for(f"{name}@{metadata.get('id')}", length=32)))
+                b64decode(str(repo.vault.random_bytes_as_base64_for(f"{name}@{node.name}", length=32)))
             )
             users[name]['keytype'] = 'ed25519'
             users[name]['privkey'] = privkey
diff --git a/nodes/home.backups.py b/nodes/home.backups.py
index 889e250..0637049 100644
--- a/nodes/home.backups.py
+++ b/nodes/home.backups.py
@@ -7,7 +7,6 @@
         'all',
     ],
     'metadata': {
-        'id': '9cf52515-63a1-4659-a8ec-6c3c881727e5',
         'backup-server': {
             'hostname': 'backups.sublimity.de',
         },
diff --git a/nodes/home.server.py b/nodes/home.server.py
index 03dd064..5a784ed 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -4,6 +4,5 @@
         'all',
     ],
     'metadata': {
-        'id': 'af96709e-b13f-4965-a588-ef2cd476437a',
     },
 }
diff --git a/nodes/htz.games.py b/nodes/htz.games.py
index 729d94a..3d4752d 100644
--- a/nodes/htz.games.py
+++ b/nodes/htz.games.py
@@ -4,6 +4,5 @@
         'all',
     ],
     'metadata': {
-        'id': '353bb086-f3ce-4f36-8533-e91786c91ed9',
     },
 }
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index edf1d73..acf9c16 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -4,6 +4,5 @@
         'all',
     ],
     'metadata': {
-        'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
     },
 }
diff --git a/nodes/netcup.secondary.py b/nodes/netcup.secondary.py
index c0141c4..9ad80e0 100644
--- a/nodes/netcup.secondary.py
+++ b/nodes/netcup.secondary.py
@@ -4,6 +4,5 @@
         'all',
     ],
     'metadata': {
-        'id': '890848b2-a900-4f74-ad5b-b811fbb4f0bc',
     },
 }