diff --git a/template_qubuntu/01_install_core.sh b/template_qubuntu/01_install_core.sh
index 5532b5e..d44bf59 100755
--- a/template_qubuntu/01_install_core.sh
+++ b/template_qubuntu/01_install_core.sh
@@ -48,6 +48,7 @@ bootstrap() {
             --arch=amd64 \
             --include="ncurses-term,locales,tasksel,$apt_https_pkgs,$eatmydata_maybe" \
             --components=main,universe \
+            --variant=minbase \
             --download-only \
             --keyring="${SCRIPTSDIR}/../keys/${DIST}-${DISTRIBUTION}-archive-keyring.gpg" \
             "${DIST}" "${INSTALLDIR}" "${mirror}" && \
@@ -69,6 +70,7 @@ bootstrap() {
             --arch=amd64 \
             --include="ncurses-term,locales,tasksel,$apt_https_pkgs,$eatmydata_maybe" \
             --components=main,universe \
+            --variant=minbase \
             --keyring="${SCRIPTSDIR}/../keys/${DIST}-${DISTRIBUTION}-archive-keyring.gpg" \
             "${DIST}" "${INSTALLDIR}" "file://${INSTALLDIR}/${TMPDIR}/dummy-repo" && \
         echo "deb ${mirror} ${DIST} main universe" > ${INSTALLDIR}/etc/apt/sources.list && \
diff --git a/template_qubuntu/packages_focal.list b/template_qubuntu/packages_focal.list
deleted file mode 120000
index 8402319..0000000
--- a/template_qubuntu/packages_focal.list
+++ /dev/null
@@ -1 +0,0 @@
-packages_bionic.list
\ No newline at end of file
diff --git a/template_qubuntu/packages_focal.list b/template_qubuntu/packages_focal.list
new file mode 100644
index 0000000..87e93ee
--- /dev/null
+++ b/template_qubuntu/packages_focal.list
@@ -0,0 +1,15 @@
+ncurses-term
+aptitude
+tasksel
+sudo
+dmsetup
+psmisc
+vim-nox
+gnupg
+git
+xterm
+libfile-mimeinfo-perl
+libglib2.0-bin
+ltrace
+strace
+haveged
diff --git a/template_qubuntu/packages_focal_standard.list b/template_qubuntu/packages_focal_standard.list
new file mode 100644
index 0000000..ae205a9
--- /dev/null
+++ b/template_qubuntu/packages_focal_standard.list
@@ -0,0 +1,24 @@
+ubuntu-standard
+ncurses-term
+aptitude
+tasksel
+sudo
+locales
+dmsetup
+psmisc
+emacs
+vim-nox
+gnupg
+firefox
+thunderbird
+keepassx
+git
+gnome-terminal
+xterm
+libfile-mimeinfo-perl
+libglib2.0-bin
+ltrace
+strace
+haveged
+linux-firmware
+software-properties-common