diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index 2288c25a7a52..d0384f0227a4 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -20,6 +20,4 @@ do_tools_host = true
 do_extras_package = true
 do_tools_common = true
 do_tools_acpidbg = true
-do_zfs		= true
-do_v4l2loopback	= true
 do_odm_drivers  = true
diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk
index e0415a4075ac..d215e1bda1fe 100644
--- a/debian.master/rules.d/arm64.mk
+++ b/debian.master/rules.d/arm64.mk
@@ -19,4 +19,3 @@ do_tools_perf_jvmti = true
 do_tools_bpftool = true
 
 do_dtbs		= true
-do_zfs		= true
diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk
index ec8f7e914614..b205a5153b51 100644
--- a/debian.master/rules.d/ppc64el.mk
+++ b/debian.master/rules.d/ppc64el.mk
@@ -16,4 +16,3 @@ do_tools_perf_jvmti = true
 do_tools_bpftool  = true
 
 #do_flavour_image_package = false
-do_zfs		= true
diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk
index 4b3698fc9c45..0620c638a724 100644
--- a/debian.master/rules.d/s390x.mk
+++ b/debian.master/rules.d/s390x.mk
@@ -17,5 +17,3 @@ do_tools_cpupower = true
 do_tools_perf     = true
 do_tools_perf_jvmti = true
 do_tools_bpftool  = true
-
-do_zfs		= true
diff --git a/debian/rules b/debian/rules
index 540e7a3cfccf..435b1616a4a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,6 @@ $(foreach _m,$(all_dkms_modules), \
 # Don't build tools in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
 	do_tools=false
-	do_zfs=false
 endif
 
 # Are any of the kernel signing options enabled.
@@ -79,7 +78,7 @@ endif
 #  - disable dkms builds as the versions used may have been deleted
 ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
 	flavours := $(firstword $(flavours))
-	$(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
+$(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
 endif
 
 # Being used to build a mainline build -- turn off things which do not work.
@@ -87,7 +86,7 @@ ifeq ($(do_mainline_build),true)
 	do_extras_package=false
 	do_tools=false
 	no_dumpfile=1
-	do_zfs=false
+$(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
 	skipabi=true
 	skipmodule=true
 	skipretpoline=true