diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer
index da6a956c3df7f220318f884917718a3d8825c572..219b5e955bc580e190d5b29332d002b5d5e7628a 100644
--- a/helpers/make-debian-installer
+++ b/helpers/make-debian-installer
@@ -26,9 +26,6 @@ find build/pkg-lists -type f | xargs sed -i /media-retriever/d
 LASTKERNEL=$(apt-cache show linux-libc-dev|grep ^Version |head -n1|cut -d" " -f2|cut -d. -f1,2,3)
 /bin/sed -i "s/^BASEVERSION.*/BASEVERSION = $LASTKERNEL/g" ./build/config/i386.cfg ./build/config/amd64.cfg
 sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/i386.cfg ./build/config/amd64.cfg
-sed -i "/signed/d" ./build/config/amd64.cfg
-
-sed 's/ubuntu-archive-keyring.gpg/trisquel-archive-keyring.gpg/' -i build/config/common
 
 sed -i 's/shim-signed/shim/g' debian/control
 
@@ -62,6 +59,10 @@ rpl "Trisquel Ltd, and Rosetta" "Canonical Ltd, and Rosetta" . -R
 rpl ubuntu-keyring trisquel-keyring . -R
 rpl ubuntu-archive-keyring trisquel-archive-keyring . -R
 
+/bin/sed -i '/KERNELNAME_ALT_SUFFIX/d' build/config/*.cfg
+/bin/sed -i '/KERNELNAME_ALT_SUFFIX/d' build/config/*/*.cfg
+/bin/sed -i '/efi.img/d' build/config/*.cfg
+
 changelog "Rebranded and adapted for Trisquel"
 compile