diff --git a/script/scriptgen.py b/script/scriptgen.py
index d3221f9e..7df0b7d6 100644
--- a/script/scriptgen.py
+++ b/script/scriptgen.py
@@ -554,8 +554,19 @@ def gen_read_files(self, f):
                             "Media1?.iso$",
                             iso,
                         )
-                    else:
+                    elif self.media1 != "0":
                         self.p(cfg.read_files_iso, f, "FOLDER", self.iso_folder.get(iso, ""), "SRCISO", iso)
+                    else:
+                        self.p(
+                            cfg.read_files_iso,
+                            f,
+                            "FOLDER",
+                            self.iso_folder.get(iso, ""),
+                            "SRCISO",
+                            iso,
+                            "Media1?.iso$",
+                            ".iso$",
+                        )
 
         if self.repolink:
             self.p(cfg.read_files_repo_link, f)
diff --git a/t/obs/openSUSE:Leap:16.0:Images:ToTest/files_iso.lst b/t/obs/openSUSE:Leap:16.0:Images:ToTest/files_iso.lst
new file mode 100644
index 00000000..64a8b4c8
--- /dev/null
+++ b/t/obs/openSUSE:Leap:16.0:Images:ToTest/files_iso.lst
@@ -0,0 +1,4 @@
+agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso
+agama-installer-openSUSE.ppc64le-9.0.0-openSUSE-Build4.9.iso
+agama-installer-openSUSE.s390x-9.0.0-openSUSE-Build4.9.iso
+agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso
diff --git a/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_openqa.before b/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_openqa.before
new file mode 100644
index 00000000..36eea124
--- /dev/null
+++ b/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_openqa.before
@@ -0,0 +1,22 @@
+/usr/bin/openqa-cli api -X post isos?async=1 \
+ ARCH=aarch64 \
+ ASSET_256=agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256 \
+ BUILD=4.9 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ DISTRI=opensuse \
+ FLAVOR=agama-installer-openSUSE \
+ ISO=agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso \
+ VERSION=16.0 \
+ _OBSOLETE=1
+
+/usr/bin/openqa-cli api -X post isos?async=1 \
+ ARCH=x86_64 \
+ ASSET_256=agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256 \
+ BUILD=4.9 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ DISTRI=opensuse \
+ FLAVOR=agama-installer-openSUSE \
+ ISO=agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso \
+ VERSION=16.0 \
+ _OBSOLETE=1
+
diff --git a/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_rsync_iso.before b/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_rsync_iso.before
new file mode 100644
index 00000000..9b0d168f
--- /dev/null
+++ b/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_rsync_iso.before
@@ -0,0 +1,4 @@
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso /var/lib/openqa/factory/iso/agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso /var/lib/openqa/factory/iso/agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256
diff --git a/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_rsync_repo.before b/t/obs/openSUSE:Leap:16.0:Images:ToTest/print_rsync_repo.before
new file mode 100644
index 00000000..e69de29b
diff --git a/xml/obs/openSUSE:Leap:16.0:Images.xml b/xml/obs/openSUSE:Leap:16.0:Images.xml
new file mode 100644
index 00000000..06033ba5
--- /dev/null
+++ b/xml/obs/openSUSE:Leap:16.0:Images.xml
@@ -0,0 +1,7 @@
+<openQA
+    project_pattern="openSUSE:Leap:(?P&lt;version&gt;16.0):Images:ToTest"
+    dist_path="images"
+    distri="opensuse"
+    archs="aarch64 x86_64">
+    <flavor name="agama-installer-openSUSE" folder="*/*agama-installer-openSUSE*" iso="1" media1="0"/>
+</openQA>