diff --git a/bundles/apt/items.py b/bundles/apt/items.py
index 9d1f3b9..b8367df 100644
--- a/bundles/apt/items.py
+++ b/bundles/apt/items.py
@@ -18,6 +18,15 @@ files = {
     '/etc/apt/apt.conf.d/20auto-upgrades': {
         'source': 'apt.conf-auto-upgrades',
     },
+    '/etc/cloud': {
+        'delete': True,
+    },
+    '/etc/netplan': {
+        'delete': True,
+    },
+    '/var/lib/cloud': {
+        'delete': True,
+    },
 }
 
 directories = {
@@ -60,9 +69,16 @@ pkg_apt = {
     'wget': {},
     'whois': {},
     'zip': {},
+
+    'cloud-init': {
+        'installed': False,
+    },
+    'netplan.io': {
+        'installed': False,
+    },
 }
 
-gpg_keys = set()
+
 for name, data in node.metadata.get('apt', {}).get('repos', {}).items():
     files['/etc/apt/sources.list.d/{}.list'.format(name)] = {
         'content_type': 'mako',
@@ -87,26 +103,3 @@ for name, data in node.metadata.get('apt', {}).get('repos', {}).items():
 if node.metadata.get('apt', {}).get('packages', {}):
     for package, options in node.metadata['apt']['packages'].items():
         pkg_apt[package] = options
-
-
-if node.metadata.get('keep-cloud-init', False):
-    pkg_apt['cloud-init'] = {
-        'installed': True,
-    }
-else:
-    pkg_apt['cloud-init'] = {
-        'installed': False,
-    }
-    pkg_apt['netplan.io'] = {
-        'installed': False,
-    }
-
-    files['/etc/cloud'] = {
-        'delete': True,
-    }
-    files['/etc/netplan'] = {
-        'delete': True,
-    }
-    files['/var/lib/cloud'] = {
-        'delete': True,
-    }
diff --git a/nodes/htz-cloud/pirmasens.py b/nodes/htz-cloud/pirmasens.py
index 40cd0bc..c5b5c12 100644
--- a/nodes/htz-cloud/pirmasens.py
+++ b/nodes/htz-cloud/pirmasens.py
@@ -4,7 +4,6 @@ nodes['htz-cloud.pirmasens'] = {
         'webserver',
     },
     'metadata': {
-        'keep-cloud-init': True,
         'letsencrypt': {
             'domains': {
                 'mail.kunsmann.info': {},
diff --git a/nodes/htz-cloud/sewfile.py b/nodes/htz-cloud/sewfile.py
index 022c274..4888756 100644
--- a/nodes/htz-cloud/sewfile.py
+++ b/nodes/htz-cloud/sewfile.py
@@ -9,7 +9,6 @@ nodes['htz-cloud.sewfile'] = {
         'webserver',
     },
     'metadata': {
-        'keep-cloud-init': True,
         'nginx': {
             'vhosts': {
                 'sewfile.franzi.business': {