diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh
index f226493d..60ff438b 100755
--- a/my-distro-debian-32-pae/build.sh
+++ b/my-distro-debian-32-pae/build.sh
@@ -203,6 +203,7 @@ ffmpegthumbnailer
 xterm
 grub-pc
 spice-vdagent
+console-setup
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh
index 8fe06732..de0f42f0 100755
--- a/my-distro-debian-32/build.sh
+++ b/my-distro-debian-32/build.sh
@@ -203,6 +203,7 @@ ffmpegthumbnailer
 xterm
 grub-pc
 spice-vdagent
+console-setup
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh
index f89ed726..d5702463 100755
--- a/my-distro-debian-64/build.sh
+++ b/my-distro-debian-64/build.sh
@@ -202,6 +202,7 @@ ffmpegthumbnailer
 xterm
 grub-pc
 spice-vdagent
+console-setup
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh
index 786ace36..f76f2559 100755
--- a/my-distro-devuan-32-pae/build.sh
+++ b/my-distro-devuan-32-pae/build.sh
@@ -203,6 +203,7 @@ ffmpegthumbnailer
 xterm
 grub-pc
 spice-vdagent
+console-setup
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh
index d365f8d4..0a97d038 100755
--- a/my-distro-devuan-32/build.sh
+++ b/my-distro-devuan-32/build.sh
@@ -203,6 +203,7 @@ ffmpegthumbnailer
 xterm
 grub-pc
 spice-vdagent
+console-setup
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh
index f92fb25c..3c80c2c9 100755
--- a/my-distro-devuan-64/build.sh
+++ b/my-distro-devuan-64/build.sh
@@ -202,6 +202,7 @@ ffmpegthumbnailer
 xterm
 grub-pc
 spice-vdagent
+console-setup
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
diff --git a/my-distro-ubuntu-64/build.sh b/my-distro-ubuntu-64/build.sh
index ae354bb8..d75d3ae6 100755
--- a/my-distro-ubuntu-64/build.sh
+++ b/my-distro-ubuntu-64/build.sh
@@ -193,6 +193,7 @@ linux-firmware
 xterm
 grub-pc
 spice-vdagent
+console-setup
 
 " > $build/build/config/package-lists/packages.list.chroot 
 
diff --git a/my-distro-ubuntu-64/calamares/modules/packages.conf b/my-distro-ubuntu-64/calamares/modules/packages.conf
index ee771196..f1278985 100644
--- a/my-distro-ubuntu-64/calamares/modules/packages.conf
+++ b/my-distro-ubuntu-64/calamares/modules/packages.conf
@@ -3,12 +3,11 @@ backend: apt
 operations:
   - remove:
       - "^live-*"
-      - calamares-settings-debian
+      - calamares-settings-lubuntu
       - calamares
       - hunspell-en-us
       - zram-config
       - cifs-utils
-      - lightdm-autologin-greeter
   - try_install:
       - language-pack-$LOCALE
       - hunspell-$LOCALE
diff --git a/my-distro-ubuntu-64/calamares/modules/users.conf b/my-distro-ubuntu-64/calamares/modules/users.conf
index 998e7bcc..a0ba0821 100644
--- a/my-distro-ubuntu-64/calamares/modules/users.conf
+++ b/my-distro-ubuntu-64/calamares/modules/users.conf
@@ -15,4 +15,4 @@ defaultGroups:
     - sambashare
 autologinGroup:  autologin
 sudoersGroup:    sudo
-setRootPassword: false
+setRootPassword: true