diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 863c7868..91e7d4e4 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -615,6 +615,46 @@
                 "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
             }
         },
+        "upgrade_desktop_encrypted_64bit_2": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_3": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_4": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_5": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_6": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_7": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_8": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_9": {
+            "profiles": {
+                "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5
+            }
+        },
         "upgrade_realmd_client": {
             "profiles": {
                 "fedora-updates-server-upgrade-ppc64le-*-ppc64le": 5,
diff --git a/templates.fif.json b/templates.fif.json
index 15037580..4213d5b9 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -3083,9 +3083,180 @@
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
-                "RETRY": "2",
+                "RETRY": "0",
                 "ROOT_PASSWORD": "weakpassword",
                 "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_2": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_3": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_4": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_5": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_6": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_7": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_8": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
+                "UPGRADE": "1",
+                "USER_LOGIN": "test",
+                "USER_PASSWORD": "weakpassword"
+            }
+        },
+        "upgrade_desktop_encrypted_64bit_9": {
+            "profiles": {
+                "fedora-universal-x86_64-*-64bit": 30,
+                "fedora-universal-aarch64-*-aarch64": 40
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "HDD_1": "disk_f%UP1REL%_desktopencrypt_2_%ARCH%.qcow2",
+                "RETRY": "0",
+                "ROOT_PASSWORD": "weakpassword",
+                "TEST_TARGET": "COMPOSE",
+                "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+                "UEFI_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+                "UEFI_SECURE": "",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm
index 95a4e67e..00fc0e7a 100644
--- a/tests/upgrade_run.pm
+++ b/tests/upgrade_run.pm
@@ -48,6 +48,10 @@ sub run {
         # before it disappears from view
         sleep 5;
     }
+    # TEST TEST
+    if (get_var("ENCRYPT_PASSWORD")) {
+        do_bootloader(postinstall => 1, params => "systemd.log_target=console console=ttyS0,115200 console=tty0", timeout => 6000);
+    }
 }