diff --git a/contrib/ci/Dockerfile-debian.in b/contrib/ci/Dockerfile-debian.in
index d4c07989c..b82e11abb 100644
--- a/contrib/ci/Dockerfile-debian.in
+++ b/contrib/ci/Dockerfile-debian.in
@@ -9,11 +9,11 @@ Package: *\n\
 Pin: release a=unstable\n\
 Pin-Priority: 800\n\
 \n\
-Package: lintian\n\
+Package: libflashrom-dev\n\
 Pin: release a=unstable\n\
 Pin-Priority: 901\n\
 \n\
-Package: tpm-udev\n\
+Package: libflashrom1\n\
 Pin: release a=unstable\n\
 Pin-Priority: 901\n'\
  > /etc/apt/preferences
diff --git a/contrib/ci/dependencies.xml b/contrib/ci/dependencies.xml
index c62159b5b..559530d6a 100644
--- a/contrib/ci/dependencies.xml
+++ b/contrib/ci/dependencies.xml
@@ -328,10 +328,19 @@
       <package variant="x86_64" />
     </distro>
   </dependency>
-  <dependency type="build" id="flashrom-dev">
+  <dependency type="build" id="libflashrom-dev">
     <distro id="fedora">
       <package>flashrom-devel</package>
     </distro>
+    <distro id="debian">
+      <control />
+      <package variant="x86_64" />
+      <package variant="i386" />
+    </distro>
+    <distro id="ubuntu">
+      <control />
+      <package variant="x86_64" />
+    </distro>
   </dependency>
   <dependency type="build" id="gcab">
     <distro id="centos">
diff --git a/contrib/debian/rules b/contrib/debian/rules
index ca7185b3d..d362fcd21 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -19,8 +19,10 @@ deb_version := $(shell dpkg-parsechangelog --show-field Version)
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	SB_STYLE := ubuntu
 	tar_name := fwupd_$(deb_version)_$(DEB_HOST_ARCH).tar.gz
+	export FLASHROM=-Dplugin_flashrom=false
 else
 	TMPLDIR  := debian/fwupd-$(DEB_HOST_ARCH)-signed-template/usr/share/code-signing/fwupd-$(DEB_HOST_ARCH)-signed-template
+	export FLASHROM=-Dplugin_flashrom=true
 endif
 
 %:
@@ -44,11 +46,6 @@ override_dh_auto_configure:
 	else \
 		export UEFI="-Dplugin_uefi=false -Dplugin_redfish=false -Dplugin_nvme=false"; \
 	fi; \
-	if [ ! -z "$$CI" ]; then \
-		export FLASHROM="-Dplugin_flashrom=true"; \
-	else \
-		export FLASHROM="-Dplugin_flashrom=false"; \
-	fi; \
 	dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true
 
 override_dh_install:
@@ -59,13 +56,6 @@ override_dh_install:
 	if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
 		dh_install -pfwupd usr/libexec/fwupd/efi ;\
 	fi
-	if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/sbin/flashrom ]; then \
-		dh_install -pfwupd usr/sbin/flashrom ;\
-		dh_install -plibfwupd2 usr/lib/*/libflashrom.so.*; \
-		dh_install -plibfwupd-dev usr/include/libflashrom.h; \
-		dh_install -plibfwupd-dev usr/lib/*/libflashrom.so; \
-		dh_install -plibfwupd-dev usr/lib/*/pkgconfig/flashrom.pc; \
-	fi
 	dh_missing -a --fail-missing
 
 	#this is placed in fwupd-tests