diff --git a/build-32-non-pae.sh b/build-32-non-pae.sh
new file mode 100755
index 00000000..aacaed09
--- /dev/null
+++ b/build-32-non-pae.sh
@@ -0,0 +1,266 @@
+#!/bin/bash
+PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
+
+# Set the working folder variable
+build="$(pwd)"
+
+
+# Create the build folder, move into it removing stale mountpoints and files there.
+[ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
+cd build
+umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
+for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+
+
+# Set of the structure to be used for the ISO and Live system.
+# See /usr/lib/live/build/config for a full list of examples.
+# Up above is the manual description of what options I used so far.
+
+lb config noauto \
+	--binary-images iso-hybrid \
+	--mode debian \
+	--architectures i386 \
+	--linux-flavours 686 \
+	--distribution bullseye \
+	--archive-areas "main contrib non-free" \
+	--mirror-bootstrap https://deb.debian.org/debian \
+	--parent-mirror-bootstrap https://deb.debian.org/debian \
+	--parent-mirror-chroot https://deb.debian.org/debian \
+	--parent-mirror-chroot-security https://security.debian.org/debian-security  \
+	--parent-mirror-binary https://deb.debian.org/debian \
+	--parent-mirror-binary-security https://security.debian.org/debian-security  \
+	--mirror-chroot https://deb.debian.org/debian \
+	--mirror-chroot-security https://security.debian.org/debian-security \
+	--uefi-secure-boot enable \
+	--updates true \
+	--security true \
+	--backports false \
+	--cache true \
+	--apt-recommends true \
+	--firmware-binary true \
+	--firmware-chroot true \
+	--iso-application "My-distro" \
+	--win32-loader false \
+	--iso-volume "My-distro-amd64_${TODAY}" \
+	--iso-publisher "Manuel rosa" \
+	--image-name "My-distro" \
+	--win32-loader false \
+	--checksums sha512 \
+	--zsync false \
+     "${@}"
+
+
+# Install the Xfce Desktop 
+mkdir -p $build/build/config/package-lists
+echo xfce4 xfce4-goodies > $build/build/config/package-lists/desktop.list.chroot 
+
+# Install software
+echo "# Install software to the squashfs for calamares to unpack to the OS.
+linux-headers-686-pae
+locales
+dkms
+dbus-x11
+ntp
+deb-multimedia-keyring
+xorg 
+xserver-xorg 
+xserver-xorg-input-synaptics 
+xserver-xorg-input-all 
+xserver-xorg-video-vmware 
+xserver-xorg-video-all
+w32codecs
+ffmpeg 
+sox 
+twolame 
+lame 
+faad 
+gstreamer1.0-plugins-good 
+gstreamer1.0-plugins-ugly 
+gstreamer1.0-plugins-bad 
+gstreamer1.0-pulseaudio
+unrar 
+rar 
+p7zip-full 
+p7zip-rar 
+zip 
+unzip
+pulseaudio 
+pavucontrol 
+alsa-utils
+aptitude 
+synaptic 
+gparted 
+apt-config-auto-update 
+libelf-dev 
+htop 
+package-update-indicator
+gnome-packagekit 
+gvfs-backends 
+samba 
+gnome-packagekit 
+network-manager 
+network-manager-gnome
+bluez 
+blueman
+gufw
+gtk2-engines
+plymouth 
+plymouth-themes
+cups 
+system-config-printer 
+lightdm 
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+menulibre
+mugshot
+xscreensaver 
+xscreensaver-data 
+xscreensaver-data-extra 
+xscreensaver-gl 
+xscreensaver-gl-extra
+gnome-system-tools 
+gnome-disk-utility
+gnome-calculator 
+neofetch 
+accountsservice 
+catfish
+fuseiso 
+timeshift
+gnome-software 
+gnome-software-plugin-flatpak 
+gnome-software-plugin-snap
+fwupd
+bleachbit 
+dconf-editor
+gimp 
+gimp-data-extras 
+evince 
+xsane
+transmission-gtk 
+thunderbird 
+thunderbird-l10n-pt-br 
+thunderbird-l10n-pt-pt 
+thunderbird-l10n-de 
+thunderbird-l10n-en-gb 
+thunderbird-l10n-es-es 
+thunderbird-l10n-fr 
+thunderbird-l10n-it
+firefox-esr
+firefox-esr-l10n-de
+firefox-esr-l10n-en-gb
+firefox-esr-l10n-es-es
+firefox-esr-l10n-it
+firefox-esr-l10n-pt-br
+firefox-esr-l10n-pt-pt
+libreoffice 
+libreoffice-gtk3 
+libreoffice-l10n-pt 
+libreoffice-l10n-pt-br 
+libreoffice-l10n-de 
+libreoffice-l10n-en-gb 
+libreoffice-l10n-es 
+libreoffice-l10n-fr 
+libreoffice-l10n-it 
+printer-driver-cups-pdf
+gnome-2048 
+gnome-chess 
+gnome-mahjongg 
+gnome-sudoku
+guvcview 
+vlc 
+qt5-style-plugins 
+qt5ct
+calamares-settings-debian 
+firmware-linux 
+firmware-linux-free
+firmware-linux-nonfree 
+firmware-misc-nonfree 
+firmware-realtek 
+firmware-atheros 
+firmware-bnx2 
+firmware-bnx2x 
+firmware-brcm80211 
+firmware-intelwimax 
+firmware-iwlwifi 
+firmware-libertas 
+firmware-netxen 
+firmware-zd1211  
+gdebi 
+f2fs-tools
+xfsprogs
+xfsdump
+tumbler
+tumbler-plugins-extra
+ffmpegthumbnailer
+xterm
+
+" > $build/build/config/package-lists/packages.list.chroot 
+
+
+# Packages to be stored in /pool but not installed in the OS .
+echo "# These packages are available to the installer, for offline use. 
+efibootmgr
+grub2-common
+grub-efi-amd64
+grub-efi-amd64-bin
+#grub-efi-ia32
+grub-efi-ia32-bin
+grub-efi-ia32-signed
+libefiboot1
+libefivar1
+mokutil
+os-prober
+shim-helpers-i386-signed
+shim-signed
+shim-signed-common
+shim-unsigned
+
+" > $build/build/config/package-lists/installer.list.binary 
+
+
+# Setup the chroot structure
+mkdir -p $build/build/config/archives
+mkdir -p $build/build/config/includes.binary
+mkdir -p $build/build/config/hooks/live
+mkdir -p $build/build/config/hooks/normal
+mkdir -p $build/build/config/bootloaders
+mkdir -p $build/build/config/packages.chroot
+mkdir -p $build/build/config/includes.chroot/etc
+mkdir -p $build/build/config/includes.chroot/usr/share/applications
+mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds
+mkdir -p $build/build/config/includes.chroot/etc/calamares
+mkdir -p $build/build/config/includes.chroot/usr/share/icons
+mkdir -p $build/build/config/includes.chroot/usr/share/themes
+mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d
+mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins
+mkdir -p $build/build/config/includes.chroot/usr/sbin
+mkdir -p $build/build/config/includes.chroot/etc/lightdm
+mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
+mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
+mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
+mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
+
+# Copy Configs to the chroot
+cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d
+cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications
+cp $build/hooks/live/* $build/build/config/hooks/live
+cp $build/hooks/normal/* $build/build/config/hooks/normal
+cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
+cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+
+cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
+cp -r $build/bootloaders/* $build/build/config/bootloaders
+cp -r $build/repos/* $build/build/config/archives
+cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
+cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
+cp -r $build/configs/* $build/build/config/includes.chroot/etc/
+cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
+cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
+cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
+cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
+cp -r $build/packages32/* $build/build/config/packages.chroot
+
+# Build the ISO #
+lb build  #--debug --verbose 
+
+