diff --git a/VARIABLES.md b/VARIABLES.md
index c0a4d282..1cfc1d70 100644
--- a/VARIABLES.md
+++ b/VARIABLES.md
@@ -14,6 +14,7 @@ These variables control settings of underlying virtual machine where tests runs
 | Variable | Values allowed | Default value | Explanation |
 | -------- | :------------: | :-----------: | ----------- |
 | `ARCH` | `x86_64`, `i686`, `aarch64`, ... | depends on tested medium | architecture of VM |
+| `ARCH_BASE_MACHINE` | `uefi`, `64bit`, `ARM`, ... | depends on machine | 'machine' value to be used for tests where we might want to start after a test run on a different machine. For instance, we run tests that produce x86_64 ISOs on the '64bit' machine, so `ARCH_BASE_MACHINE` for the 'uefi' machine is set to '64bit', so that we can run UEFI install tests on the 'uefi' machine with an image generated by a test run on the '64bit' machine |
 | `BIOS` | filename | `ovmf-x86_64-ms.bin` for `x86_64` UEFI, not set otherwise | set different BIOS |
 | `BOOTFROM` | characters (see man qemu, `-boot order=` option) | not set | boot from different medium than CD |
 | `CDMODEL` | see `qemu-kvm -device help` | not set/Qemu default | type of device for CD |
diff --git a/templates b/templates
index 1dd4a9ab..26979da2 100755
--- a/templates
+++ b/templates
@@ -4249,6 +4249,7 @@
                         { key => "QEMUCPUS", value => "2"},
                         { key => "QEMUVGA", value => "std"},
                         { key => "QEMURAM", value => "2048"},
+                        { key => "ARCH_BASE_MACHINE", value => "64bit" },
                         { key => "PART_TABLE_TYPE", value => "mbr"},
                         { key => "WORKER_CLASS", value => "qemu_x86_64" },
                         { key => "QEMU_VIRTIO_RNG", value => "1"}
@@ -4262,6 +4263,7 @@
                         { key => "QEMUCPUS", value => "2"},
                         { key => "QEMUVGA", value => "std"},
                         { key => "QEMURAM", value => "2048"},
+                        { key => "ARCH_BASE_MACHINE", value => "64bit" },
                         { key => "UEFI", value => "1"},
                         { key => "UEFI_PFLASH_CODE", value => "/usr/share/edk2/ovmf/OVMF_CODE.fd"},
                         { key => "UEFI_PFLASH_VARS", value => "/usr/share/edk2/ovmf/OVMF_VARS.fd"},
@@ -4278,6 +4280,7 @@
                         { key => "QEMUCPUS", value => "2"},
                         { key => "QEMUMACHINE", value => "virt"},
                         { key => "QEMURAM", value => "1024"},
+                        { key => "ARCH_BASE_MACHINE", value => "ARM" },
                         { key => "QEMU_NO_KVM", value => "1"},
                         { key => "TIMEOUT_SCALE", value => "5" },
                         { key => "SERIALDEV", value => "ttyAMA0" },
@@ -4296,6 +4299,7 @@
                         { key => "QEMUVGA", value => "std" },
                         { key => "QEMURAM", value => 4096 },
                         { key => "QEMUCPU", value => "host" },
+                        { key => "ARCH_BASE_MACHINE", value => "pcc64le" },
                         { key => "WORKER_CLASS", value => "qemu_ppc64le" },
                         { key => "PART_TABLE_TYPE", value => "mbr"},
                         { key => "QEMU_VIRTIO_RNG", value => "1"}
@@ -4310,6 +4314,7 @@
                         { key => "QEMUVGA", value => "std" },
                         { key => "QEMURAM", value => 4096 },
                         { key => "QEMUCPU", value => "host" },
+                        { key => "ARCH_BASE_MACHINE", value => "ppc64" },
                         { key => "WORKER_CLASS", value => "qemu_ppc64" },
                         { key => "PART_TABLE_TYPE", value => "mbr"},
                         { key => "QEMU_VIRTIO_RNG", value => "1"}
@@ -4324,6 +4329,7 @@
                         { key => "QEMUMACHINE", value => "virt"},
                         { key => "QEMURAM", value => 3072 },
                         { key => "QEMUCPU", value => "host" },
+                        { key => "ARCH_BASE_MACHINE", value => "aarch64" },
                         { key => "TIMEOUT_SCALE", value => "1.5" },
                         { key => "SERIALDEV", value => "ttyAMA0" },
                         { key => "UEFI", value => "1"},
diff --git a/templates-updates b/templates-updates
index 16c2eee1..938b354f 100755
--- a/templates-updates
+++ b/templates-updates
@@ -402,6 +402,18 @@
                                     },
                       test_suite => { name => "install_default_update" },
                     },
+                    {
+                      group_name => "Fedora Updates",
+                      machine    => { name => "uefi" },
+                      prio       => 41,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "updates-installer",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_default_update" },
+                    },
                     {
                       group_name => "Fedora PowerPC Updates",
                       machine    => { name => "ppc64le" },
@@ -1000,9 +1012,9 @@
                         { key => "ISO", value => "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso" },
                         { key => "NICTYPE", value => "tap" },
                         { key => "PACKAGE_SET", value => "default" },
-                        { key => "PARALLEL_WITH", value => "support_server" },
+                        { key => "PARALLEL_WITH", value => "support_server:%ARCH_BASE_MACHINE%" },
                         { key => "ADD_REPOSITORY_VARIATION", value => "nfs://10.0.2.110:/opt/update_repo" },
-                        { key => "+START_AFTER_TEST", value => "installer_build" },
+                        { key => "+START_AFTER_TEST", value => "installer_build:%ARCH_BASE_MACHINE%" },
                         { key => "WORKER_CLASS", value => "tap" },
                       ],
                     },