diff --git a/bundles/apt/items.py b/bundles/apt/items.py
index 82e5b86..9d1f3b9 100644
--- a/bundles/apt/items.py
+++ b/bundles/apt/items.py
@@ -1,9 +1,9 @@
 actions = {
     'apt_update': {
         'command': 'apt-get update',
-        'needed_by': [
+        'needed_by': {
             'pkg_apt:',
-        ],
+        },
         'triggered': True,
         'cascade_skip': False,
     },
@@ -67,37 +67,22 @@ for name, data in node.metadata.get('apt', {}).get('repos', {}).items():
     files['/etc/apt/sources.list.d/{}.list'.format(name)] = {
         'content_type': 'mako',
         'content': "\n".join(data['items']),
-        'triggers': [
+        'triggers': {
             'action:apt_update',
-        ],
+        },
     }
 
-    if 'key' in data:
-        gpg_keys.add(data['key'])
+    if data.get('install_gpg_key', True):
+        files['/etc/apt/sources.list.d/{}.list'.format(name)]['needs'] = {
+            'file:/etc/apt/trusted.gpg.d/{}.list.asc'.format(name),
+        }
 
-        files['/etc/apt/sources.list.d/{}.list'.format(name)]['needs'] = [
-            'action:add_gpg_key_{}'.format(data['key']),
-        ]
-
-previous_action = None
-for key in gpg_keys:
-    files['/etc/apt/gpg-keys/{}'.format(key)] = {
-        'source': 'gpg-keys/{}'.format(key),
-    }
-
-    action_name = 'add_gpg_key_{}'.format(key)
-    action_item_name = 'action:' + action_name
-    actions[action_name] = {
-        'command': 'apt-key add /etc/apt/gpg-keys/{}'.format(key),
-        'unless': 'apt-key export {} 2>/dev/null | grep -q "END PGP PUBLIC KEY BLOCK"'.format(key),
-        'cascade_skip': False,
-        'needed_by': ["action:apt_update"],
-        'needs': list(filter(None, [
-            'file:/etc/apt/gpg-keys/{}'.format(key),
-            previous_action,
-        ])),
-    }
-    previous_action = action_item_name
+        files['/etc/apt/trusted.gpg.d/{}.list.asc'.format(name)] = {
+            'source': 'gpg-keys/{}.asc'.format(name),
+            'triggers': {
+                'action:apt_update',
+            },
+        }
 
 if node.metadata.get('apt', {}).get('packages', {}):
     for package, options in node.metadata['apt']['packages'].items():
diff --git a/bundles/jenkins-ci/metadata.py b/bundles/jenkins-ci/metadata.py
index 1640573..321086d 100644
--- a/bundles/jenkins-ci/metadata.py
+++ b/bundles/jenkins-ci/metadata.py
@@ -2,7 +2,6 @@ defaults = {
     'apt': {
         'repos': {
             'jenkins': {
-                'key': '150FDE3F7787E7D11EF4E12A9B7D32F2D50582E6',
                 'items': [
                     'deb https://pkg.jenkins.io/debian-stable binary/',
                 ],
diff --git a/bundles/matrix-synapse/metadata.py b/bundles/matrix-synapse/metadata.py
index b5697a6..4355d73 100644
--- a/bundles/matrix-synapse/metadata.py
+++ b/bundles/matrix-synapse/metadata.py
@@ -2,7 +2,6 @@ defaults = {
     'apt': {
         'repos': {
             'matrix': {
-                'key': 'AAF9AE843A7584B5A3E4CD2BCF45A512DE2DA058',
                 'items': [
                     'deb https://packages.matrix.org/debian buster main',
                 ],
diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py
index 6fd28f4..d6354c7 100644
--- a/bundles/nginx/metadata.py
+++ b/bundles/nginx/metadata.py
@@ -2,7 +2,6 @@ defaults = {
     'apt': {
         'repos': {
             'nginx': {
-                'key': '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
                 'items': [
                     'deb http://nginx.org/packages/debian buster nginx',
                 ],
diff --git a/bundles/nodejs/metadata.py b/bundles/nodejs/metadata.py
index fc23e87..5d3f914 100644
--- a/bundles/nodejs/metadata.py
+++ b/bundles/nodejs/metadata.py
@@ -2,13 +2,11 @@ defaults = {
     'apt': {
         'repos': {
             'yarn': {
-                'key': '72ECF46A56B4AD39C907BBB71646B01B86E50310',
                 'items': [
                     'deb https://dl.yarnpkg.com/debian/ stable main',
                 ],
             },
             'node': {
-                'key': '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
                 'items': [
                     'deb https://deb.nodesource.com/node_10.x buster main',
                     'deb-src https://deb.nodesource.com/node_10.x buster main',
diff --git a/data/apt/files/gpg-keys/150FDE3F7787E7D11EF4E12A9B7D32F2D50582E6 b/data/apt/files/gpg-keys/150FDE3F7787E7D11EF4E12A9B7D32F2D50582E6
deleted file mode 100644
index bab880e..0000000
--- a/data/apt/files/gpg-keys/150FDE3F7787E7D11EF4E12A9B7D32F2D50582E6
+++ /dev/null
@@ -1,144 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQGiBEmFQG0RBACXScOxb6BTV6rQE/tcJopAEWsdvmE0jNIRWjDDzB7HovX6Anrq
-n7+Vq4spAReSFbBVaYiiOx2cGDymj2dyx2i9NAI/9/cQXJOU+RPdDzHVlO1Edksp
-5rKn0cGPWY5sLxRf8s/tO5oyKgwCVgTaB5a8gBHaoGms3nNC4YYf+lqlpwCgjbti
-3u1iMIx6Rs+dG0+xw1oi5FUD/2tLJMx7vCUQHhPRupeYFPoD8vWpcbGb5nHfHi4U
-8/x4qZspAIwvXtGw0UBHildGpqe9onp22Syadn/7JgMWhHoFw5Ke/rTMlxREL7pa
-TiXuagD2G84tjJ66oJP1FigslJzrnG61y85V7THL61OFqDg6IOP4onbsdqHby4VD
-zZj9A/9uQxIn5250AGLNpARStAcNPJNJbHOQuv0iF3vnG8uO7/oscB0TYb8/juxr
-hs9GdSN0U0BxENR+8KWy5lttpqLMKlKRknQYy34UstQiyFgAQ9Epncu9uIbVDgWt
-y7utnqXN033EyYkcWx5EhLAgHkC7wSzeSWABV3JSXN7CeeOif7QiS29oc3VrZSBL
-YXdhZ3VjaGkgPGtrQGtvaHN1a2Uub3JnPohjBBMRAgAjAhsDBgsJCAcDAgQVAggD
-BBYCAwECHgECF4AFAko/7vYCGQEACgkQm30y8tUFguabhgCgi54IQR4rpJZ/uUHe
-ZB879zUWTQwAniQDBO+Zly7Fsvm0Mcvqvl02UzxCiGAEExECACAFAkmFQG0CGwMG
-CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCbfTLy1QWC5qtXAJ9hPRisOhkexWXJ
-nXQMl9cOTvm4LgCdGint1TONoZ2I4JtOiFzOmeP3ju3RzcvNyQEQAAEBAAAAAAAA
-AAAAAAAA/9j/4AAQSkZJRgABAQEAYABgAAD/4QBgRXhpZgAASUkqAAgAAAAEADEB
-AgAZAAAAPgAAABBRAQABAAAAAUOQABFRBAABAAAAEgsAABJRBAABAAAAEgsAAAAA
-AABNYWNyb21lZGlhIEZpcmV3b3JrcyA0LjAAAP/bAEMACAYGBwYFCAcHBwkJCAoM
-FA0MCwsMGRITDxQdGh8eHRocHCAkLicgIiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0
-Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
-MjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAK4AlgMBIgACEQEDEQH/xAAfAAAB
-BQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0B
-AgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
-KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImK
-kpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj
-5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJ
-Cgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGh
-scEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
-WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1
-tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEA
-AhEDEQA/APcBI/8Afb86XzH/AL7fnUYpwqRknmN/fP50u9v7x/OmCgUASb2/vH86
-Xe394/nTBS0AP3t/eP50u4+p/OmUopgO3H1NO3H1NR5xThQA7cfWlyfU0ylFMQ/J
-9aXPvTKdQAuaM0lLQAtJmiigAzRSdqKAKApwpopc1mUOpRSUopgKKWkFLQAueKzr
-zXbCwk2Tzxq3cFwK8v8Aih8V30aaTQ9DKtegYnuTyIvZR3b+VfP1/q17fzvLc3Ms
-sjHJZ2JJNGr2HZdT6j8U/FbR/DcKsM3VxLkpGh6AetcI37Ql4Zcx6LAYx2aUgmvD
-1ju7obgJHA7nmmmG4TqjDHtS+ZXL1sfVPhT4yeH/ABFNHaXYbS71zhVnYGNz6B+n
-4HFejK2RmvhJJSDiTj6ivYvht8XptE8rSPEEklxpxwkFyTue39j6p+op3a3Javsf
-RuacDVaC4juIUmhkWSKRQyspyGB7ipgasgfmlpoNLmgBaKSigBaKM0UAUBS0lKKz
-KFFLSUooAdWR4o1qLw/4bvtSmZVEMRK57t2H51rCvJPj7etD4WsbQMQJ7jkDuFBN
-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
-=fBn8
------END PGP PUBLIC KEY BLOCK-----
diff --git a/data/apt/files/gpg-keys/jenkins.asc b/data/apt/files/gpg-keys/jenkins.asc
new file mode 100644
index 0000000..cd0eef5
--- /dev/null
+++ b/data/apt/files/gpg-keys/jenkins.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+Z77i4FhdLio04srxWsN+FkRwkBJdkJ8VKEE=
+=0xpA
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/data/apt/files/gpg-keys/AAF9AE843A7584B5A3E4CD2BCF45A512DE2DA058 b/data/apt/files/gpg-keys/matrix.asc
similarity index 100%
rename from data/apt/files/gpg-keys/AAF9AE843A7584B5A3E4CD2BCF45A512DE2DA058
rename to data/apt/files/gpg-keys/matrix.asc
diff --git a/data/apt/files/gpg-keys/miniflux.asc b/data/apt/files/gpg-keys/miniflux.asc
new file mode 100644
index 0000000..dec8324
--- /dev/null
+++ b/data/apt/files/gpg-keys/miniflux.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF8qN84BCACqNBFC2qcOmftVi4UAETq/4/87JYTtwKhtJVZxfPfnxwhLel7K
+8QhYJwdnPv/oefTMi+N8SdWUTGB7+AO77QhvvbWSmhV6ZLc4KyctUV6l5e09kSYe
+1KCilGkZ77ugQUSwgyDGYX5ELHOfwYQp1fKI6Hhgmm3sDU9mVqYOL/O2dRBgovhf
+MfzV1M5WcOz8XS6FMEsy0vTsAXlhhoSSzXZM2rZMl+E+QPDPTI9VFUsfHgWMKJmM
+Y3lVB2/oMGba3iX8TpVvR4rn4GjocnxC1qCIDeK1ssLNoeiggDm7HSLrR36gDTCs
+jfJQ7OZTZx9YfG1pSmRWInqAN4G8XWv7LlNVABEBAAG0I0Zyw6lkw6lyaWMgR3Vp
+bGxvdCA8ZkBtaW5pZmx1eC5uZXQ+iQFUBBMBCAA+FiEEWnqJrPBVJMqg82+brreh
+ZAcQjbUFAl8qN84CGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ
+rrehZAcQjbWllAf/Z9S4gK+u53xg1wMgUVwDGj8AvanpGr6Flpaxe0u5dAgBRZxY
+bqUcDz/WlUJ7DzH3qO0lFZfoRXFbtgAR9LxVZr969VpbIVbLoKN4968vkpIsZGhL
+7fFMAWHgvUl/Zjs7sRpYDv8NcNoA8vjbkOTGq2O9PUpHCDKSFzTHk3cvvrLbNSQA
+OhJdH/a0UmUPZIXjoI14VlvhuQzPExnasHSkXT9EwlTG8lq8d4ZJcu5nC+CXNOvg
+/hjeo5fT7jW5+yNHA4y1+pN9T5CuO26LIMHQwq0Kv+Yk7meukPY+cYcZmhzs/KNg
+hvGqhe8Rgkmx/TiEczbqVWly/5WvqKxO1EluorkBDQRfKjfOAQgArQe/KHF1krRx
+xz4bbE9tuCAbCQi8bezwoMWbmDoAqkq4V4q2DPNBiu5+rSyYtaYsCxEv3Ed6Q2B4
+lqIE/BQ+ncUNwkthly/LY2DSEcV4RInPoBhQbWw9zRQCydKlv8A1p74ixEVZJtXF
+LmqdVzDEpYwA/cGVIcZB4gwzqtD3hjGpI+Y3Js8rqlUxOiGU3KiURsCVEUFiCcoA
+Hs2eQ0F4oflexQ53GLYIARarj0UefwMEM7b5NXUoM2yzE0CscLA4AQWL92GFFE1I
+nAHIITETHAXtiqKiVU3SY6C9IZm0Fsojd+QQukQB/nJr2fl422CIUHqlCymHlNYD
+tEW+4zh5kQARAQABiQE8BBgBCAAmFiEEWnqJrPBVJMqg82+brrehZAcQjbUFAl8q
+N84CGwwFCQPCZwAACgkQrrehZAcQjbVdUAgAi4RB9eHtORuq3nr7aCWcAZcqNJ3n
+EqQvwk41nnm7+jsFtAQY3i6AVv/SDNEOZCsh7mfmyDJemjASewHFsFsadAmQYjoz
+KO7GWzGWf7keqiRVa43LHhdNd6zJy3Whr4K2Hg/6kiCqQ30X0o55q51Ba4Or2U7K
+hmkAN1fRbdErhIJVc4THL64Cj/A1u034BeqRBtkDlaiUh/Q0jZpMSJkTp87v8glA
+/Ib1Hcyd47/U2bDmiQvQMfSaJ9k9niOaelOFAofsUnQ5JZsztF0HXhGqt/2xAtS/
+C+RlTKmeO8NXUhTxchPtIndIKM2t7f+URNqVlKDy8terxFSXUfkX+gxtkw==
+=InHd
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/data/apt/files/gpg-keys/573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 b/data/apt/files/gpg-keys/nginx.asc
similarity index 100%
rename from data/apt/files/gpg-keys/573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
rename to data/apt/files/gpg-keys/nginx.asc
diff --git a/data/apt/files/gpg-keys/9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280 b/data/apt/files/gpg-keys/node.asc
similarity index 100%
rename from data/apt/files/gpg-keys/9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280
rename to data/apt/files/gpg-keys/node.asc
diff --git a/data/apt/files/gpg-keys/rspamd.asc b/data/apt/files/gpg-keys/rspamd.asc
new file mode 100644
index 0000000..a4e86b6
--- /dev/null
+++ b/data/apt/files/gpg-keys/rspamd.asc
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=BILd
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/data/apt/files/gpg-keys/weechat.asc b/data/apt/files/gpg-keys/weechat.asc
new file mode 100644
index 0000000..9827772
--- /dev/null
+++ b/data/apt/files/gpg-keys/weechat.asc
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+qbO3wgTCCdnoticOvw==
+=xmBr
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/data/apt/files/gpg-keys/72ECF46A56B4AD39C907BBB71646B01B86E50310 b/data/apt/files/gpg-keys/yarn.asc
similarity index 100%
rename from data/apt/files/gpg-keys/72ECF46A56B4AD39C907BBB71646B01B86E50310
rename to data/apt/files/gpg-keys/yarn.asc
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index c42e773..89cc6ba 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -40,10 +40,26 @@ nodes['htz.ex42-1048908'] = {
             },
             'repos': {
                 'buster-backports': {
+                    'install_gpg_key': False, # default debian signing key
                     'items': [
                         'deb http://deb.debian.org/debian buster-backports main',
                     ],
                 },
+                'miniflux': {
+                    'items': {
+                        'deb https://apt.miniflux.app/ /',
+                    },
+                },
+                'rspamd': {
+                    'items': {
+                        'deb [arch=amd64] http://rspamd.com/apt-stable/ buster main',
+                    },
+                },
+                'weechat': {
+                    'items': {
+                        'deb https://weechat.org/debian buster main',
+                    },
+                },
             },
         },
         'letsencrypt': {