diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh
index 78db27ec..256a99d9 100755
--- a/my-distro-debian-32-pae/build.sh
+++ b/my-distro-debian-32-pae/build.sh
@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -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
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh
index d09bb76c..96daf86d 100755
--- a/my-distro-debian-32/build.sh
+++ b/my-distro-debian-32/build.sh
@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -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
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh
index e85c92f3..401c75e8 100755
--- a/my-distro-debian-64/build.sh
+++ b/my-distro-debian-64/build.sh
@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -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
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
diff --git a/my-distro-devuan-32-pae/BldHelper.sh b/my-distro-devuan-32-pae/BldHelper.sh
index 5c94464e..d31381b5 100755
--- a/my-distro-devuan-32-pae/BldHelper.sh
+++ b/my-distro-devuan-32-pae/BldHelper.sh
@@ -48,4 +48,3 @@ lb clean
 # Remove the "fusato" directory and its contents
 cd ..
 rm -rf build
-
diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh
index 9025c5dc..b05b9230 100755
--- a/my-distro-devuan-32-pae/build.sh
+++ b/my-distro-devuan-32-pae/build.sh
@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -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
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh
index ee09ad8f..71a4eca5 100755
--- a/my-distro-devuan-32/build.sh
+++ b/my-distro-devuan-32/build.sh
@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -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
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh
index bf28e3ed..2c9f5b37 100755
--- a/my-distro-devuan-64/build.sh
+++ b/my-distro-devuan-64/build.sh
@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -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
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
diff --git a/my-distro-ubuntu-64/BldHelper.sh b/my-distro-ubuntu-64/BldHelper.sh
index cc014149..633bc6de 100755
--- a/my-distro-ubuntu-64/BldHelper.sh
+++ b/my-distro-ubuntu-64/BldHelper.sh
@@ -48,4 +48,3 @@ lb clean
 # Remove the "fusato" directory and its contents
 cd ..
 rm -rf build
-
diff --git a/my-distro-ubuntu-64/build.sh b/my-distro-ubuntu-64/build.sh
index d75d3ae6..5581b8a3 100755
--- a/my-distro-ubuntu-64/build.sh
+++ b/my-distro-ubuntu-64/build.sh
@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -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
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
diff --git a/my-distro-ubuntu-64/calamares/modules/fstab.conf b/my-distro-ubuntu-64/calamares/modules/fstab.conf
index 29907170..8da60df0 100644
--- a/my-distro-ubuntu-64/calamares/modules/fstab.conf
+++ b/my-distro-ubuntu-64/calamares/modules/fstab.conf
@@ -1,11 +1,27 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configure fstab options
+#
 ---
 mountOptions:
-    default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
-ssdExtraMountOptions:
-    ext4: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
+    default: defaults,noatime,nodiscard
+    btrfs: defaults,noatime,noautodefrag,nodiscard
+    btrfs_swap: defaults
+    swap: defaults
+
 crypttabOptions: luks,keyscript=/bin/cat
+
+efiMountOptions: umask=0077
+
+ssdExtraMountOptions:
+    btrfs: ssd
+
+tmpOptions:
+    default:
+        tmpfs: false
+        options: ""
+    ssd:
+        tmpfs: true
+        options: "defaults,noatime,mode=1777"
+
diff --git a/my-distro-ubuntu-64/calamares/modules/mount.conf b/my-distro-ubuntu-64/calamares/modules/mount.conf
index bb28eed6..b22676f1 100644
--- a/my-distro-ubuntu-64/calamares/modules/mount.conf
+++ b/my-distro-ubuntu-64/calamares/modules/mount.conf
@@ -1,18 +1,10 @@
-# Mount filesystems in the target (generally, before treating the
-# target as a usable chroot / "live" system). Filesystems are
-# automatically mounted from the partitioning module. Filesystems
-# listed here are **extra**. The filesystems listed in *extraMounts*
-# are mounted in all target systems. The filesystems listed in
-# *extraMountsEfi* are mounted in the target system **only** if
-# the host machine uses UEFI.
----
-# Extra filesystems to mount. The key's value is a list of entries; each
-# entry has four keys:
-#   - device    The device node to mount
-#   - fs        The filesystem type to use
-#   - mountPoint Where to mount the filesystem
-#   - options (optional) Extra options to pass to mount(8)
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
 #
+# Mount filesystems in the target (generally, before treating the
+# target as a usable chroot / "live" system).
+---
+
 extraMounts:
     - device: proc
       fs: proc
@@ -29,8 +21,18 @@ extraMounts:
     - device: /run/udev
       mountPoint: /run/udev
       options: bind
-
-extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
+
+btrfsSwapSubvol: /@swap
+
+btrfsSubvolumes:
+    - mountPoint: /
+      subvolume: /@
+    - mountPoint: /home
+      subvolume: /@home
+    - mountPoint: /var/cache
+      subvolume: /@cache
+    - mountPoint: /var/log
+      subvolume: /@log
diff --git a/my-distro-ubuntu-64/calamares/modules/openrcdmcryptcfg.conf b/my-distro-ubuntu-64/calamares/modules/openrcdmcryptcfg.conf
new file mode 100644
index 00000000..0dbd0782
--- /dev/null
+++ b/my-distro-ubuntu-64/calamares/modules/openrcdmcryptcfg.conf
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration file for opendmcryptcfg module
+#
+---
+configFilePath: /etc/conf.d/dmcrypt
diff --git a/my-distro-ubuntu-64/calamares/modules/partition.conf b/my-distro-ubuntu-64/calamares/modules/partition.conf
index a0423714..68d182d8 100644
--- a/my-distro-ubuntu-64/calamares/modules/partition.conf
+++ b/my-distro-ubuntu-64/calamares/modules/partition.conf
@@ -1,10 +1,15 @@
 efiSystemPartition:     "/boot/efi"
+efiSystemPartitionSize:     800M
+efiSystemPartitionName:     EFI
 userSwapChoices:
     - none      # Create no swap, use no swap
     - small     # Up to 4GB
     - suspend   # At least main memory size
     - file      # To swap file instead of partition
+swapPartitionName: SWAP
+drawNestedPartitions: false
 alwaysShowPartitionLabels: true
+allowManualPartitioning: true
 initialPartitioningChoice: erase
 initialSwapChoice: none
 defaultFileSystemType:  "ext4"
diff --git a/my-distro-ubuntu-64/calamares/modules/services-systemd.conf b/my-distro-ubuntu-64/calamares/modules/services-systemd.conf
new file mode 100644
index 00000000..ed4608b2
--- /dev/null
+++ b/my-distro-ubuntu-64/calamares/modules/services-systemd.conf
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Systemd services manipulation.
+#
+# This module can enable services, timers and targets for systemd
+# (if packaging doesn't already do that). It can also
+# disable services and targets as well as mask units.
+
+timers:
+   - name: "fstrim"
+     mandatory: false
+
diff --git a/my-distro-ubuntu-64/calamares/modules/users.conf b/my-distro-ubuntu-64/calamares/modules/users.conf
index a0ba0821..37c0a687 100644
--- a/my-distro-ubuntu-64/calamares/modules/users.conf
+++ b/my-distro-ubuntu-64/calamares/modules/users.conf
@@ -14,5 +14,10 @@ defaultGroups:
     - bluetooth
     - sambashare
 autologinGroup:  autologin
+doAutologin:     false
 sudoersGroup:    sudo
 setRootPassword: true
+doReusePassword: true
+allowWeakPasswords: true
+allowWeakPasswordsDefault: true
+userShell: /bin/bash