diff --git a/.kres.yaml b/.kres.yaml
index 94a1a63e..7b65b27f 100644
--- a/.kres.yaml
+++ b/.kres.yaml
@@ -9,7 +9,7 @@ spec:
     - btrfs
     - chelsio-drivers
     - chelsio-firmware
-    - drbd
+    # - drbd see https://github.com/siderolabs/pkgs/pull/873
     - ecr-credential-provider
     - fuse3
     - gasket-driver
@@ -33,7 +33,7 @@ spec:
     - usb-modem-drivers
     - util-linux-tools
     - xe-guest-utilities
-    - zfs
+    # - zfs see https://github.com/siderolabs/pkgs/pull/873
   additionalTargets:
     nonfree:
       - nonfree-kmod-nvidia
@@ -74,7 +74,7 @@ spec:
       - name: EXTENSIONS_IMAGE_REF
         defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
       - name: PKGS
-        defaultValue: v1.7.0-alpha.0-13-gf376a53
+        defaultValue: v1.7.0-alpha.0-17-gefbbd23
       - name: PKGS_PREFIX
         defaultValue: ghcr.io/siderolabs
     depends:
diff --git a/Makefile b/Makefile
index f1b540d9..afd1ea3d 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,6 @@ TARGETS += bnx2-bnx2x
 TARGETS += btrfs
 TARGETS += chelsio-drivers
 TARGETS += chelsio-firmware
-TARGETS += drbd
 TARGETS += ecr-credential-provider
 TARGETS += fuse3
 TARGETS += gasket-driver
@@ -81,13 +80,12 @@ TARGETS += thunderbolt
 TARGETS += usb-modem-drivers
 TARGETS += util-linux-tools
 TARGETS += xe-guest-utilities
-TARGETS += zfs
 NONFREE_TARGETS = nonfree-kmod-nvidia
 
 # extra variables
 
 EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
-PKGS ?= v1.7.0-alpha.0-13-gf376a53
+PKGS ?= v1.7.0-alpha.0-17-gefbbd23
 PKGS_PREFIX ?= ghcr.io/siderolabs
 
 # help menu
diff --git a/drivers/thunderbolt/files/modules.txt b/drivers/thunderbolt/files/modules.txt
index 4ad4e5ac..e196496d 100644
--- a/drivers/thunderbolt/files/modules.txt
+++ b/drivers/thunderbolt/files/modules.txt
@@ -2,4 +2,4 @@ modules.order
 modules.builtin
 modules.builtin.modinfo
 kernel/drivers/thunderbolt/thunderbolt.ko
-kernel/drivers/net/thunderbolt-net.ko
+kernel/drivers/net/thunderbolt/thunderbolt_net.ko
diff --git a/drivers/usb-modem/files/modules-aarch64.txt b/drivers/usb-modem/files/modules-aarch64.txt
new file mode 100644
index 00000000..344735fb
--- /dev/null
+++ b/drivers/usb-modem/files/modules-aarch64.txt
@@ -0,0 +1,36 @@
+modules.order
+modules.builtin
+modules.builtin.modinfo
+kernel/drivers/net/usb/dm9601.ko
+kernel/drivers/net/usb/rndis_host.ko
+kernel/drivers/net/usb/smsc75xx.ko
+kernel/drivers/net/usb/sierra_net.ko
+kernel/drivers/net/usb/cdc_subset.ko
+kernel/drivers/net/usb/int51x1.ko
+kernel/drivers/net/usb/cdc_eem.ko
+kernel/drivers/net/usb/cdc_ncm.ko
+kernel/drivers/net/usb/zaurus.ko
+kernel/drivers/net/usb/net1080.ko
+kernel/drivers/net/usb/qmi_wwan.ko
+kernel/drivers/net/usb/mcs7830.ko
+kernel/drivers/net/usb/aqc111.ko
+kernel/drivers/net/usb/sr9700.ko
+kernel/drivers/net/usb/usbnet.ko
+kernel/drivers/net/usb/sr9800.ko
+kernel/drivers/net/usb/plusb.ko
+kernel/drivers/net/usb/lg-vl600.ko
+kernel/drivers/net/usb/cdc-phonet.ko
+kernel/drivers/net/usb/smsc95xx.ko
+kernel/drivers/net/usb/gl620a.ko
+kernel/drivers/net/usb/r8153_ecm.ko
+kernel/drivers/net/usb/cdc_ether.ko
+kernel/drivers/net/usb/cx82310_eth.ko
+kernel/drivers/net/usb/huawei_cdc_ncm.ko
+kernel/drivers/net/usb/kalmia.ko
+kernel/drivers/net/usb/asix.ko
+kernel/drivers/net/usb/cdc_mbim.ko
+kernel/drivers/net/usb/ax88179_178a.ko
+kernel/drivers/net/phy/ax88796b.ko
+kernel/drivers/usb/class/cdc-wdm.ko
+kernel/drivers/usb/serial/usb_wwan.ko
+kernel/drivers/usb/serial/option.ko
diff --git a/drivers/usb-modem/files/modules.txt b/drivers/usb-modem/files/modules-x86_64.txt
similarity index 100%
rename from drivers/usb-modem/files/modules.txt
rename to drivers/usb-modem/files/modules-x86_64.txt
diff --git a/drivers/usb-modem/pkg.yaml b/drivers/usb-modem/pkg.yaml
index 700342bc..7089ae31 100644
--- a/drivers/usb-modem/pkg.yaml
+++ b/drivers/usb-modem/pkg.yaml
@@ -16,7 +16,7 @@ steps:
 
         mkdir -p /rootfs
 
-        xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{}
+        xargs -a /pkg/files/modules-{{ .ARCH }}.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{}
         depmod -b /rootfs ${KERNELRELEASE}
   - test:
       - |
diff --git a/drivers/v4l-uvc/files/modules.txt b/drivers/v4l-uvc/files/modules.txt
new file mode 100644
index 00000000..49b0505e
--- /dev/null
+++ b/drivers/v4l-uvc/files/modules.txt
@@ -0,0 +1,12 @@
+modules.order
+modules.builtin
+modules.builtin.modinfo
+kernel/drivers/media/common/uvc.ko
+kernel/drivers/media/common/videobuf2/videobuf2-common.ko
+kernel/drivers/media/common/videobuf2/videobuf2-memops.ko
+kernel/drivers/media/common/videobuf2/videobuf2-v4l2.ko
+kernel/drivers/media/common/videobuf2/videobuf2-vmalloc.ko
+kernel/drivers/media/mc/mc.ko
+kernel/drivers/media/usb/uvc/uvcvideo.ko
+kernel/drivers/media/v4l2-core/v4l2-dv-timings.ko
+kernel/drivers/media/v4l2-core/videodev.ko