diff --git a/groups/os/debian-11.py b/groups/os/debian-11.py
index 8fadbad..81c8de7 100644
--- a/groups/os/debian-11.py
+++ b/groups/os/debian-11.py
@@ -3,14 +3,6 @@
         'debian',
     ],
     'metadata': {
-        'apt': {
-            'sources': {
-                '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',
-            },
-        },
         'php': {
             'version': '7.4',
         },
diff --git a/groups/os/debian-12.py b/groups/os/debian-12.py
index 27ab6dc..25d072a 100644
--- a/groups/os/debian-12.py
+++ b/groups/os/debian-12.py
@@ -5,10 +5,11 @@
     'metadata': {
         'apt': {
             'sources': {
-                'deb https://deb.debian.org/debian {codename} main contrib non-free non-free-firmware',
-                'deb https://deb.debian.org/debian {codename}-updates main contrib non-free non-free-firmware',
-                'deb https://deb.debian.org/debian {codename}-backports main contrib non-free non-free-firmware',
-                'deb https://security.debian.org/ {codename}-security main contrib non-free non-free-firmware',
+                'debian': {
+                    'components': {
+                        'non-free-firmware',
+                    },
+                },
             },
         },
         'php': {
diff --git a/groups/os/debian.py b/groups/os/debian.py
index 3a9c57e..0676311 100644
--- a/groups/os/debian.py
+++ b/groups/os/debian.py
@@ -9,6 +9,24 @@
     ],
     'metadata': {
         'apt': {
+            'sources': {
+                'debian': {
+                    'types': {'deb'},
+                    'url': 'https://deb.debian.org/debian',
+                    'distributions': {
+                        '{codename}',
+                        '{codename}-security',
+                        '{codename}-updates',
+                    },
+                    'components': {
+                        'main',
+                        'contrib',
+                        'non-free',
+                        'non-free-firmware',
+                    },
+                    'key': 'debian',
+                },
+            },
             'packages': {
                 'mtr-tiny': {},
             },