diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index eb556ca..1743c49 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6273,9 +6273,9 @@ CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_NONE=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_COMPRESS_ZSTD=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODULE_REL_CRCS=y
diff --git a/debian/rules b/debian/rules
index 1628610..f236759 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,8 @@ ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
 	do_zfs=false
 endif
 
+do_zfs=false
+
 # Being used to build a mainline build -- turn off things which do not work.
 ifeq ($(do_mainline_build),true)
 	do_extras_package=false
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 2f131a1..31b7950 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -34,7 +34,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc
 	[ "$(do_odm_drivers)" = 'true' ] && true || \
 		sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \
 		    $(builddir)/build-$*/.config
-	find $(builddir)/build-$* -name "*.ko" | xargs rm -f
+	find $(builddir)/build-$* -name "*.ko.zst" | xargs rm -f
 	$(build_cd) $(kmake) $(build_O) -j1 syncconfig prepare scripts
 	touch $@
 
@@ -424,7 +424,7 @@ ifneq ($(skipdbg),true)
 	# pointing to unstripped verson
 	find $(pkgdir) \
 	  $(if $(filter true,$(do_extras_package)),$(pkgdir_ex)) \
-	  -name '*.ko' | while read path_module ; do \
+	  -name '*.ko.zst' | while read path_module ; do \
 		module="/lib/modules/$${path_module#*/lib/modules/}"; \
 		if [[ -f "$(dbgpkgdir)/usr/lib/debug/$$module" ]] ; then \
 			while IFS= read -r -d '' signature < <(tail -c 28 "$$path_module"); do \
@@ -452,17 +452,17 @@ endif
 		$(builddir)/build-$*/Module.symvers | sort > $(abidir)/$*
 
 	# Build the final ABI modules information.
-	find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | \
-		sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > $(abidir)/$*.modules
+	find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko.zst | \
+		sed -e 's/.*\/\([^\/]*\)\.ko.zst/\1/' | sort > $(abidir)/$*.modules
 
 	# Build the final ABI firmware information.
-	find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | \
+	find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko.zst | \
 	while read ko; do \
 		/sbin/modinfo $$ko | grep ^firmware || true; \
 	done | sort -u >$(abidir)/$*.fwinfo
 
 	# Build the final ABI compiler information.
-	ko=$$(find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | head -1); \
+	ko=$$(find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko.zst | head -1); \
 	readelf -p .comment "$$ko" | gawk ' \
 		($$1 == "[") { \
 			printf("%s", $$3); \
@@ -594,7 +594,7 @@ ifeq ($(do_extras_package),true)
 	# If $(ship_extras_package) is explicitly set to false, then do not
 	# construct the linux-image-extra package; instead just log all of the
 	# "extra" modules which were pointlessly built yet won't be shipped.
-	find $(pkgdir_ex) -name '*.ko' | sort \
+	find $(pkgdir_ex) -name '*.ko.zst' | sort \
 		| sed 's|^$(pkgdir_ex)/|NOT-SHIPPED |' \
 		| tee -a $(target_flavour).not-shipped.log;
   else
diff --git a/debian/scripts/module-inclusion b/debian/scripts/module-inclusion
index ccec0f2..cfd6c80 100755
--- a/debian/scripts/module-inclusion
+++ b/debian/scripts/module-inclusion
@@ -20,6 +20,8 @@ NROOT=$2
 ILIST=$3
 DEPMAP=$4
 
+echo "LIST: $ILIST"
+
 tmp="/tmp/module-inclusion.$$"
 
 #
@@ -30,12 +32,13 @@ mkdir -p ${NROOT}
 {
 	# Copy over the framework into the master package.
 	if  [ "$master" -eq 1 ]; then
-		(cd ${ROOT}; find . ! -name "*.ko" -type f)
+		(cd ${ROOT}; find . ! -name "*.ko.zst" -type f)
 	fi
 
 	# Copy over modules by name or pattern.
 	while read -r i
 	do
+		i="${i}.zst"
 		#
 		# 'find' blurts a warning if it cannot find any ko files.
 		#
@@ -44,7 +47,7 @@ mkdir -p ${NROOT}
 			(cd ${ROOT}; ${i#!} || true)
 			;;
 		*\**)
-			(cd ${ROOT}; eval find "${i}" -name "*.ko" || true)
+			(cd ${ROOT}; eval find "${i}" -name "*.ko.zst" || true)
 			;;
 		*)
 			echo "$i"