diff --git a/bundles/apt/items.py b/bundles/apt/items.py
index 8e16df3..7757efd 100644
--- a/bundles/apt/items.py
+++ b/bundles/apt/items.py
@@ -103,7 +103,10 @@ pkg_apt = {
 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']),
+        'content': ("\n".join(sorted(data['items']))).format(
+            os=node.os,
+            os_release=supported_os[node.os][node.os_version[0]],
+        ),
         'triggers': {
             'action:apt_update',
         },
diff --git a/bundles/jenkins-ci/metadata.py b/bundles/jenkins-ci/metadata.py
index 321086d..b89e925 100644
--- a/bundles/jenkins-ci/metadata.py
+++ b/bundles/jenkins-ci/metadata.py
@@ -3,7 +3,7 @@ defaults = {
         'repos': {
             'jenkins': {
                 'items': [
-                    'deb https://pkg.jenkins.io/debian-stable binary/',
+                    'deb https://pkg.jenkins.io/{os}-stable binary/',
                 ],
             },
         },
diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py
index fa823c3..c99b167 100644
--- a/bundles/nginx/metadata.py
+++ b/bundles/nginx/metadata.py
@@ -3,13 +3,13 @@ defaults = {
         'repos': {
             'nginx': {
                 'items': [
-                    'deb http://nginx.org/packages/debian buster nginx',
+                    'deb http://nginx.org/packages/{os} {os_release} nginx',
                 ],
             },
         },
         'unattended-upgrades': {
             'origins': {
-                'o=nginx,a=stable,n=buster,l=nginx,c=nginx',
+                'o=nginx,a=stable,l=nginx,c=nginx',
             },
         },
         'packages': {
diff --git a/bundles/nodejs/metadata.py b/bundles/nodejs/metadata.py
index 5d3f914..f497563 100644
--- a/bundles/nodejs/metadata.py
+++ b/bundles/nodejs/metadata.py
@@ -3,19 +3,19 @@ defaults = {
         'repos': {
             'yarn': {
                 'items': [
-                    'deb https://dl.yarnpkg.com/debian/ stable main',
+                    'deb https://dl.yarnpkg.com/{os}/ stable main',
                 ],
             },
             'node': {
                 'items': [
-                    'deb https://deb.nodesource.com/node_10.x buster main',
-                    'deb-src https://deb.nodesource.com/node_10.x buster main',
+                    'deb https://deb.nodesource.com/node_10.x {os_release} main',
+                    'deb-src https://deb.nodesource.com/node_10.x {os_release} main',
                 ],
             },
         },
         'unattended-upgrades': {
             'origins': {
-                'o=Node Source,n=buster,l=Node Source,c=main',
+                'o=Node Source,l=Node Source,c=main',
                 'o=yarn,a=stable,n=stable,l=yarn-stable,c=main',
             },
         },
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index bcffeea..b5e2407 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -48,7 +48,7 @@ nodes['htz.ex42-1048908'] = {
                 'backports': {
                     'install_gpg_key': False, # default debian signing key
                     'items': [
-                        'deb http://deb.debian.org/debian buster-backports main',
+                        'deb http://deb.debian.org/debian {os_release}-backports main',
                     ],
                 },
                 'miniflux': {
@@ -58,12 +58,12 @@ nodes['htz.ex42-1048908'] = {
                 },
                 'rspamd': {
                     'items': {
-                        'deb [arch=amd64] http://rspamd.com/apt-stable/ buster main',
+                        'deb [arch=amd64] http://rspamd.com/apt-stable/ {os_release} main',
                     },
                 },
                 'weechat': {
                     'items': {
-                        'deb https://weechat.org/debian buster main',
+                        'deb https://weechat.org/debian {os_release} main',
                     },
                 },
             },