diff -Nru ubiquity-20.04.15.2/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py ubiquity-20.04.15.3/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py
--- ubiquity-20.04.15.2/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py	2020-07-21 11:32:24.000000000 -0300
+++ ubiquity-20.04.15.3/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py	2021-01-13 11:42:57.000000000 -0300
@@ -45,8 +45,7 @@
     config['stepPrepare'] = {}
     stepPrepare = config['stepPrepare']
     stepPrepare['page_title'] = \
-        '<span size="xx-large">Updates and other software</span>'\
-        .format(distro_flavor)
+        '<span size="xx-large">Updates and other software</span>'
     stepPrepare['prepare_best_results'] = \
         'For best results, please ensure that this computer:'
     stepPrepare['prepare_foss_disclaimer'] = \
diff -Nru ubiquity-20.04.15.2/d-i/manifest ubiquity-20.04.15.3/d-i/manifest
--- ubiquity-20.04.15.2/d-i/manifest	2020-07-21 11:32:24.000000000 -0300
+++ ubiquity-20.04.15.3/d-i/manifest	2021-01-13 11:40:00.000000000 -0300
@@ -18,7 +18,7 @@
 partman-basicfilesystems 127ubuntu2
 partman-basicmethods 70
 partman-btrfs 29ubuntu1
-partman-crypto 101ubuntu4
+partman-crypto 101ubuntu4.1
 partman-efi 71ubuntu5
 partman-ext3 86ubuntu1
 partman-jfs 58
@@ -28,6 +28,6 @@
 partman-target 98ubuntu1
 partman-xfs 66
 preseed 1.71ubuntu11
-shim-signed 1.40.3
+shim-signed 1.40.4
 tzsetup 1:0.94ubuntu2
 user-setup 1.63ubuntu6
diff -Nru ubiquity-20.04.15.2/d-i/source/partman-crypto/debian/changelog ubiquity-20.04.15.3/d-i/source/partman-crypto/debian/changelog
--- ubiquity-20.04.15.2/d-i/source/partman-crypto/debian/changelog	2019-06-21 08:03:35.000000000 -0300
+++ ubiquity-20.04.15.3/d-i/source/partman-crypto/debian/changelog	2021-01-07 16:51:37.000000000 -0300
@@ -1,3 +1,12 @@
+partman-crypto (101ubuntu4.1) focal; urgency=medium
+
+  * Add preseed option 'partman-crypto/luksformat_options' to
+    provide more options for 'cryptsetup luksFormat' (LP: #1898129)
+    - d/partman-crypto.templates: add preseed option.
+    - lib/crypto-base.sh: check for, log, and use it.
+
+ -- Mauricio Faria de Oliveira <mfo@canonical.com>  Thu, 07 Jan 2021 16:51:37 -0300
+
 partman-crypto (101ubuntu4) eoan; urgency=medium
 
   * Drop a big block in finish.d that iterates partman, and then does
diff -Nru ubiquity-20.04.15.2/d-i/source/partman-crypto/debian/partman-crypto.templates ubiquity-20.04.15.3/d-i/source/partman-crypto/debian/partman-crypto.templates
--- ubiquity-20.04.15.2/d-i/source/partman-crypto/debian/partman-crypto.templates	2019-02-03 04:01:08.000000000 -0200
+++ ubiquity-20.04.15.3/d-i/source/partman-crypto/debian/partman-crypto.templates	2021-01-07 16:51:12.000000000 -0300
@@ -509,3 +509,8 @@
  Please enter the passphrase for the encrypted volume ${DEVICE}.
  .
  If you don't enter anything, the volume will not be activated.
+
+Template: partman-crypto/luksformat_options
+Type: string
+Description: for internal use; can be preseeded.
+ Provide additional options to the cryptsetup luksFormat command.
diff -Nru ubiquity-20.04.15.2/d-i/source/partman-crypto/lib/crypto-base.sh ubiquity-20.04.15.3/d-i/source/partman-crypto/lib/crypto-base.sh
--- ubiquity-20.04.15.2/d-i/source/partman-crypto/lib/crypto-base.sh	2019-03-08 09:44:50.000000000 -0300
+++ ubiquity-20.04.15.3/d-i/source/partman-crypto/lib/crypto-base.sh	2021-01-07 16:51:12.000000000 -0300
@@ -205,7 +205,7 @@
 }
 
 setup_luks () {
-	local mapping device cipher iv size pass
+	local mapping device cipher iv size pass luksopts
 	mapping=$1
 	device=$2
 	cipher=$3
@@ -234,7 +234,11 @@
 	fi
 
 	if [ $zkey_available -eq 0 ]; then
-		log-output -t partman-crypto /sbin/cryptsetup -c $cipher-$iv -h $hash -s $size luksFormat $device $pass
+		if db_get partman-crypto/luksformat_options; then
+			luksopts="$RET"
+			log "Additional options for luksFormat: '$luksopts'"
+		fi
+		log-output -t partman-crypto /sbin/cryptsetup -c $cipher-$iv -h $hash -s $size $luksopts luksFormat $device $pass
 		if [ $? -ne 0 ]; then
 			log "luksFormat failed"
 			return 2
diff -Nru ubiquity-20.04.15.2/d-i/source/shim-signed/debian/changelog ubiquity-20.04.15.3/d-i/source/shim-signed/debian/changelog
--- ubiquity-20.04.15.2/d-i/source/shim-signed/debian/changelog	2020-04-09 15:48:31.000000000 -0300
+++ ubiquity-20.04.15.3/d-i/source/shim-signed/debian/changelog	2020-08-07 08:42:41.000000000 -0300
@@ -1,3 +1,10 @@
+shim-signed (1.40.4) focal; urgency=medium
+
+  * Update to the signed 15+1552672080.a4a1fbe-0ubuntu2 binary from Microsoft.
+    (LP: #1862171)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 07 Aug 2020 13:42:41 +0200
+
 shim-signed (1.40.3) focal; urgency=medium
 
   * Depend on the correct version of grub-signed (LP: #1871895)
Binary files /tmp/PdGUNlGzVa/ubiquity-20.04.15.2/d-i/source/shim-signed/shimaa64.efi.signed and /tmp/Yyz2_z_sV7/ubiquity-20.04.15.3/d-i/source/shim-signed/shimaa64.efi.signed differ
diff -Nru ubiquity-20.04.15.2/debian/changelog ubiquity-20.04.15.3/debian/changelog
--- ubiquity-20.04.15.2/debian/changelog	2020-07-21 11:32:24.000000000 -0300
+++ ubiquity-20.04.15.3/debian/changelog	2021-01-13 11:42:57.000000000 -0300
@@ -1,3 +1,13 @@
+ubiquity (20.04.15.3) focal; urgency=medium
+
+  * Automatic update of included source packages:
+    partman-crypto 101ubuntu4.1, shim-signed 1.40.4. (LP: #1898129)
+  * Fix FTBFS with new pyflakes (fixed in Groovy/20.10.4, no LP bug):
+    autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py:48:
+    .format(...) has unused arguments at position(s): 0
+
+ -- Mauricio Faria de Oliveira <mfo@canonical.com>  Wed, 13 Jan 2021 11:42:57 -0300
+
 ubiquity (20.04.15.2) focal; urgency=medium
 
   * gtk_ui, prepare: Run 'apt update' before installing OEM metapackages. We