diff --git a/helpers/DATA/base-installer/amd64.sh b/helpers/DATA/base-installer/amd64.sh
index 63b1346fdf98068dd372fca2a9a5b4357eb78dcc..be52108abaf41c2228149895f3806bebc5d17dbc 100644
--- a/helpers/DATA/base-installer/amd64.sh
+++ b/helpers/DATA/base-installer/amd64.sh
@@ -14,18 +14,24 @@ arch_get_kernel () {
 	echo "linux-generic"
 	echo "linux-image-generic"
 
-	echo "linux-server"
-	echo "linux-image-server"
+	echo "linux-generic-hwe-20.04"
+	echo "linux-image-generic-hwe-20.04"
 
-	echo "linux-virtual"
-	echo "linux-image-virtual"
+        echo "linux-lowlatency"
+        echo "linux-image-lowlatency"
 
-	echo "linux-xen"
-	echo "linux-image-xen"
+        echo "linux-lowlatency-hwe-20.04"
+        echo "linux-image-lowlatency-hwe-20.04"
 
-	echo "linux-preempt"
-	echo "linux-image-preempt"
+        echo "linux-oem-20.04"
+        echo "linux-image-oem-20.04"
 
-	echo "linux-rt"
-	echo "linux-image-rt"
+        echo "linux-virtual"
+        echo "linux-image-virtual"
+
+        echo "linux-image-extra-virtual"
+	echo "linux-virtual-hwe-20.04"
+
+	echo "linux-image-virtual-hwe-20.04"
+	echo "linux-image-extra-virtual-hwe-20.04"
 }
diff --git a/helpers/make-base-installer b/helpers/make-base-installer
index 077019453200dcbaa183120952d12310dc422490..ca72774f101a20b7c17fc321d1de8d15953909df 100644
--- a/helpers/make-base-installer
+++ b/helpers/make-base-installer
@@ -29,8 +29,8 @@ sed s/KERNEL_PRIO=medium/KERNEL_PRIO=high/g library.sh -i
 sed 's/main,restricted/main/; s/ubuntu/trisquel/' -i library.sh ./debian/bootstrap-base.postinst 
 sed 's/ubuntu-keyring/trisquel-keyring/' -i ./debian/control
 
-#rpl SECMIRROR/ubuntu MIRROR/trisquel . -R
-#rpl /trisquel \$DIRECTORY . -R
+rpl SECMIRROR/ubuntu MIRROR/trisquel . -R
+rpl /trisquel \$DIRECTORY . -R
 
 changelog "Rebranded and adapted for Trisquel"
 compile