diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py
index 624e2a6..a270d5f 100644
--- a/bundles/zfs/metadata.py
+++ b/bundles/zfs/metadata.py
@@ -3,11 +3,6 @@
 defaults = {
     'apt': {
         'packages': {
-            'linux-headers-amd64': {
-                'needed_by': {
-                    'pkg_apt:zfs-dkms',
-                },
-            },
             'zfs-dkms': {
                 'needed_by': {
                     'pkg_apt:zfs-zed',
@@ -147,6 +142,24 @@ def packages(metadata):
         },
     }
 
+@metadata_reactor.provides(
+    'apt/packages',
+)
+def linux_headers(metadata):
+    cpu_arch = metadata.get('cpu_arch', 'amd64')
+
+    return {
+        'apt': {
+            'packages': {
+                f'linux-headers-{cpu_arch}': {
+                    'needed_by': {
+                        'pkg_apt:zfs-dkms',
+                    },
+                },
+            },
+        },
+    }
+
 
 @metadata_reactor.provides(
     'systemd-timers/timers/zfs-scrub',