diff --git a/templates.fif.json b/templates.fif.json
index d5a19c96..168241c4 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -73,6 +73,28 @@
         }
     },
     "Products": {
+        "fedora-BaseOS-boot-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "BaseOS-boot-iso",
+            "settings": {
+                "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "+QEMUCPU": "Haswell",
+                "TEST_TARGET": "ISO"
+            },
+            "version": "*"
+        },
+        "fedora-BaseOS-dvd-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "BaseOS-dvd-iso",
+            "settings": {
+                "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "+QEMUCPU": "Haswell",
+                "TEST_TARGET": "ISO"
+            },
+            "version": "*"
+        },
         "fedora-Cloud_Base-qcow2-qcow2-aarch64-*": {
             "arch": "aarch64",
             "distri": "fedora",
@@ -407,6 +429,14 @@
         }
     },
     "Profiles": {
+        "fedora-BaseOS-boot-iso-x86_64-*-uefi": {
+            "machine": "uefi",
+            "product": "fedora-BaseOS-boot-iso-x86_64-*"
+        },
+        "fedora-BaseOS-dvd-iso-x86_64-*-uefi": {
+            "machine": "uefi",
+            "product": "fedora-BaseOS-dvd-iso-x86_64-*"
+        },
         "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": {
             "machine": "aarch64",
             "product": "fedora-Cloud_Base-qcow2-qcow2-aarch64-*"
@@ -1524,6 +1554,7 @@
         },
         "install_default": {
             "profiles": {
+                "fedora-BaseOS-boot-iso-x86_64-*-uefi": 50,
                 "fedora-Everything-boot-iso-ppc64le-*-ppc64le": 62,
                 "fedora-Everything-boot-iso-x86_64-*-64bit": 10,
                 "fedora-Everything-boot-iso-x86_64-*-uefi": 11,
@@ -1543,6 +1574,7 @@
         },
         "install_default_upload": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
                 "fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
                 "fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index 6b1c8d9e..e481eb26 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -183,7 +183,7 @@ sub run {
             # we set "identification" to "true".
             # Here, we will watch for the graphical elements in Anaconda main hub.
             my $branched = get_var('VERSION');
-            if ($identification eq 'true' or $branched ne "Rawhide") {
+            if ($identification eq 'true' or ($branched ne "Rawhide" && $branched ne "ELN")) {
                 check_left_bar();    # See utils.pm
                 check_prerelease();
                 check_version();
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index e20c9577..9af2d50f 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -73,7 +73,7 @@ sub run {
     # etc.
     my $identification = get_var('IDENTIFICATION');
     my $branched = get_var('VERSION');
-    if ($identification eq 'true' or $branched ne "Rawhide") {
+    if ($identification eq 'true' or ($branched ne "Rawhide" && $branched ne "ELN")) {
         check_left_bar();
         check_prerelease();
         check_version();
diff --git a/tests/disk_guided_empty.pm b/tests/disk_guided_empty.pm
index 09dd6dcd..8b60fb70 100644
--- a/tests/disk_guided_empty.pm
+++ b/tests/disk_guided_empty.pm
@@ -20,7 +20,7 @@ sub run {
     }
     # Here the self identification test code is placed.
     my $branched = get_var('VERSION');
-    if ($identification eq 'true' or $branched ne "Rawhide") {
+    if ($identification eq 'true' or ($branched ne "Rawhide" && $branched ne "ELN")) {
         # See utils.pm
         check_top_bar();
         # we don't check version or pre-release because here those