diff --git a/bundles/apt/items.py b/bundles/apt/items.py
index 05e6a4c..204b626 100644
--- a/bundles/apt/items.py
+++ b/bundles/apt/items.py
@@ -68,7 +68,7 @@ for host, sources in hosts.items():
     files[f'/etc/apt/sources.list.d/{host}.list'] = {
         'content': '\n'.join(sorted(set(
             str(source).format(
-                release=node.metadata.get('os_release'),
+                codename=node.metadata.get('os_codename'),
                 version=node.os_version[0], # WIP crystal
             )
                 for source in sources
@@ -95,7 +95,7 @@ for package, options in node.metadata.get('apt/packages', {}).items():
         files[f'/etc/apt/preferences.d/{package}'] = {
             'content': '\n'.join([
                 f"Package: {package}",
-                f"Pin: release a={node.metadata.get('os_release')}-backports",
+                f"Pin: release a={node.metadata.get('os_codename')}-backports",
                 f"Pin-Priority: 900",
             ]),
             'needed_by': [
diff --git a/bundles/icinga2/metadata.py b/bundles/icinga2/metadata.py
index 7e58d3f..0dd3c20 100644
--- a/bundles/icinga2/metadata.py
+++ b/bundles/icinga2/metadata.py
@@ -9,7 +9,7 @@ defaults = {
             'monitoring-plugins': {},
         },
         'sources': {
-            'deb https://packages.icinga.com/debian icinga-{release} main',
+            'deb https://packages.icinga.com/debian icinga-{codename} main',
         },
     },
     'icinga2': {
diff --git a/bundles/icingaweb2/metadata.py b/bundles/icingaweb2/metadata.py
index 5e78709..346961d 100644
--- a/bundles/icingaweb2/metadata.py
+++ b/bundles/icingaweb2/metadata.py
@@ -14,7 +14,7 @@ defaults = {
             'icingaweb2-module-monitoring': {},
         },
         'sources': {
-            'deb https://packages.icinga.com/debian icinga-{release} main',
+            'deb https://packages.icinga.com/debian icinga-{codename} main',
         },
     },
     'icingaweb2': {
diff --git a/bundles/influxdb2/metadata.py b/bundles/influxdb2/metadata.py
index c7ce52c..98dc0d3 100644
--- a/bundles/influxdb2/metadata.py
+++ b/bundles/influxdb2/metadata.py
@@ -7,7 +7,7 @@ defaults = {
             'influxdb2-cli': {},
         },
         'sources': {
-            'deb https://repos.influxdata.com/debian {release} stable',
+            'deb https://repos.influxdata.com/debian {codename} stable',
         },
     },
     'nftables': {
diff --git a/bundles/nodejs/metadata.py b/bundles/nodejs/metadata.py
index 1e4f046..faed20d 100644
--- a/bundles/nodejs/metadata.py
+++ b/bundles/nodejs/metadata.py
@@ -23,8 +23,8 @@ def sources(metadata):
     return {
         'apt': {
             'sources': {
-                f'deb https://deb.nodesource.com/node_{version}.x {{release}} main',
-                f'deb-src https://deb.nodesource.com/node_{version}.x {{release}} main',
+                f'deb https://deb.nodesource.com/node_{version}.x {{codename}} main',
+                f'deb-src https://deb.nodesource.com/node_{version}.x {{codename}} main',
             },
         },
     }
diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py
index 5953efb..3f1802a 100644
--- a/bundles/telegraf/metadata.py
+++ b/bundles/telegraf/metadata.py
@@ -95,11 +95,11 @@ defaults = {
     'apt/sources',
 )
 def apt(metadata):
-    release = {
+    codename = {
         'buster': 'buster',
         'bullseye': 'bullseye',
         'bookworm': 'bullseye',
-    }[metadata.get('os_release')]
+    }[metadata.get('os_codename')]
 
     return {
         'apt': {
@@ -107,7 +107,7 @@ def apt(metadata):
                 'telegraf': {},
             },
             'sources': {
-                f"deb https://repos.influxdata.com/debian {release} stable",
+                f"deb https://repos.influxdata.com/debian {codename} stable",
             },
         },
     }
diff --git a/groups/os/debian-11.py b/groups/os/debian-11.py
index caf08aa..81c8de7 100644
--- a/groups/os/debian-11.py
+++ b/groups/os/debian-11.py
@@ -9,7 +9,7 @@
         'postgresql': {
             'version': '13',
         },
-        'os_release': 'bullseye',
+        'os_codename': 'bullseye',
     },
     'os_version': (11,),
 }
diff --git a/groups/os/debian-12.py b/groups/os/debian-12.py
index 0aff049..5c5f88e 100644
--- a/groups/os/debian-12.py
+++ b/groups/os/debian-12.py
@@ -9,7 +9,7 @@
         'postgresql': {
             'version': '14',
         },
-        'os_release': 'bookworm',
+        'os_codename': 'bookworm',
     },
     'os_version': (12,),
 }
diff --git a/groups/os/debian.py b/groups/os/debian.py
index ac8c8f6..0c2d28f 100644
--- a/groups/os/debian.py
+++ b/groups/os/debian.py
@@ -10,10 +10,10 @@
     'metadata': {
         'apt': {
             'sources': {
-                'deb https://deb.debian.org/debian {release} main contrib non-free',
-                'deb https://deb.debian.org/debian {release}-updates main contrib non-free',
-                'deb https://deb.debian.org/debian {release}-backports main contrib non-free',
-                'deb https://security.debian.org/ {release}-security main contrib non-free',
+                'deb https://deb.debian.org/debian {codename} main contrib non-free',
+                'deb https://deb.debian.org/debian {codename}-updates main contrib non-free',
+                'deb https://deb.debian.org/debian {codename}-backports main contrib non-free',
+                'deb https://security.debian.org/ {codename}-security main contrib non-free',
             },
             'packages': {
                 'mtr-tiny': {},