diff --git a/t/obs/systemsmanagement:Agama:Devel/base/files_iso b/t/obs/systemsmanagement:Agama:Devel/base/files_iso
new file mode 100644
index 00000000..3ddd893b
--- /dev/null
+++ b/t/obs/systemsmanagement:Agama:Devel/base/files_iso
@@ -0,0 +1,3 @@
+agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso
+agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso
+agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso
diff --git a/t/obs/systemsmanagement:Agama:Devel/base/files_iso.lst b/t/obs/systemsmanagement:Agama:Devel/base/files_iso.lst
new file mode 100644
index 00000000..3ddd893b
--- /dev/null
+++ b/t/obs/systemsmanagement:Agama:Devel/base/files_iso.lst
@@ -0,0 +1,3 @@
+agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso
+agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso
+agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso
diff --git a/t/obs/systemsmanagement:Agama:Devel/base/print_openqa.before b/t/obs/systemsmanagement:Agama:Devel/base/print_openqa.before
new file mode 100644
index 00000000..be6db971
--- /dev/null
+++ b/t/obs/systemsmanagement:Agama:Devel/base/print_openqa.before
@@ -0,0 +1,33 @@
+/usr/bin/openqa-cli api -X post isos?async=1 \
+ ARCH=86_64 \
+ ASSET_256=agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso.sha256 \
+ BUILD=17.9 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ DISTRI=opensuse \
+ FLAVOR=agama-installer \
+ ISO=agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso \
+ VERSION=agama-9.0 \
+ _OBSOLETE=1
+
+/usr/bin/openqa-cli api -X post isos?async=1 \
+ ARCH=aarch64 \
+ ASSET_256=agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso.sha256 \
+ BUILD=17.9 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ DISTRI=opensuse \
+ FLAVOR=agama-installer \
+ ISO=agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso \
+ VERSION=agama-9.0 \
+ _OBSOLETE=1
+
+/usr/bin/openqa-cli api -X post isos?async=1 \
+ ARCH=ppc64le \
+ ASSET_256=agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso.sha256 \
+ BUILD=17.9 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ DISTRI=opensuse \
+ FLAVOR=agama-installer \
+ ISO=agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso \
+ VERSION=agama-9.0 \
+ _OBSOLETE=1
+
diff --git a/t/obs/systemsmanagement:Agama:Devel/base/print_rsync_iso.before b/t/obs/systemsmanagement:Agama:Devel/base/print_rsync_iso.before
new file mode 100644
index 00000000..86bff20a
--- /dev/null
+++ b/t/obs/systemsmanagement:Agama:Devel/base/print_rsync_iso.before
@@ -0,0 +1,6 @@
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso /var/lib/openqa/factory/iso/agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso /var/lib/openqa/factory/iso/agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso /var/lib/openqa/factory/iso/agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso.sha256
diff --git a/t/obs/systemsmanagement:Agama:Devel/print_rsync_repo.before b/t/obs/systemsmanagement:Agama:Devel/base/print_rsync_repo.before
similarity index 100%
rename from t/obs/systemsmanagement:Agama:Devel/print_rsync_repo.before
rename to t/obs/systemsmanagement:Agama:Devel/base/print_rsync_repo.before
diff --git a/t/obs/systemsmanagement:Agama:Devel/files_iso.lst b/t/obs/systemsmanagement:Agama:Devel/files_iso.lst
deleted file mode 100644
index 647d7018..00000000
--- a/t/obs/systemsmanagement:Agama:Devel/files_iso.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso
-agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso
-agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso
-agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso
-
diff --git a/t/obs/systemsmanagement:Agama:Devel/print_openqa.before b/t/obs/systemsmanagement:Agama:Devel/print_openqa.before
deleted file mode 100644
index 082e0a4e..00000000
--- a/t/obs/systemsmanagement:Agama:Devel/print_openqa.before
+++ /dev/null
@@ -1,44 +0,0 @@
-/usr/bin/openqa-cli api -X post isos?async=1 \
- ARCH=x86_64 \
- ASSET_256=agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso.sha256 \
- BUILD=8.7 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
- DISTRI=opensuse \
- FLAVOR=agama-installer \
- ISO=agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso \
- VERSION=agama-9.0 \
- _OBSOLETE=1
-
-/usr/bin/openqa-cli api -X post isos?async=1 \
- ARCH=aarch64 \
- ASSET_256=agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso.sha256 \
- BUILD=8.7 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
- DISTRI=opensuse \
- FLAVOR=agama-installer \
- ISO=agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso \
- VERSION=agama-9.0 \
- _OBSOLETE=1
-
-/usr/bin/openqa-cli api -X post isos?async=1 \
- ARCH=ppc64le \
- ASSET_256=agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso.sha256 \
- BUILD=8.7 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
- DISTRI=opensuse \
- FLAVOR=agama-installer \
- ISO=agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso \
- VERSION=agama-9.0 \
- _OBSOLETE=1
-
-/usr/bin/openqa-cli api -X post isos?async=1 \
- ARCH=s390x \
- ASSET_256=agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso.sha256 \
- BUILD=8.7 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
- DISTRI=opensuse \
- FLAVOR=agama-installer \
- ISO=agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso \
- VERSION=agama-9.0 \
- _OBSOLETE=1
-
diff --git a/t/obs/systemsmanagement:Agama:Devel/print_rsync_iso.before b/t/obs/systemsmanagement:Agama:Devel/print_rsync_iso.before
deleted file mode 100644
index a655071f..00000000
--- a/t/obs/systemsmanagement:Agama:Devel/print_rsync_iso.before
+++ /dev/null
@@ -1,8 +0,0 @@
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso /var/lib/openqa/factory/iso/agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso.sha256 /var/lib/openqa/factory/other/agama-installer.x86_64-9.0.0-openSUSE-Build8.7.iso.sha256
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso /var/lib/openqa/factory/iso/agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso.sha256 /var/lib/openqa/factory/other/agama-installer.aarch64-9.0.0-openSUSE-Build8.7.iso.sha256
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso /var/lib/openqa/factory/iso/agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso.sha256 /var/lib/openqa/factory/other/agama-installer.ppc64le-9.0.0-openSUSE-Build8.7.iso.sha256
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso.sha256 /var/lib/openqa/factory/other/agama-installer.s390x-9.0.0-openSUSE-Build8.7.iso.sha256
diff --git a/t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst b/t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst
new file mode 100644
index 00000000..7141d0d0
--- /dev/null
+++ b/t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst
@@ -0,0 +1,4 @@
+agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso
+agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso
+agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso
+agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso
diff --git a/t/obs/systemsmanagement:Agama:Devel/s390x/print_openqa.before b/t/obs/systemsmanagement:Agama:Devel/s390x/print_openqa.before
new file mode 100644
index 00000000..2e165c16
--- /dev/null
+++ b/t/obs/systemsmanagement:Agama:Devel/s390x/print_openqa.before
@@ -0,0 +1,17 @@
+/usr/bin/openqa-cli api -X post isos?async=1 \
+ ARCH=s390x \
+ ASSET_256=agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256 \
+ BUILD=17.9 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ DISTRI=opensuse \
+ FLAVOR=agama-installer \
+ FULLURL=1 \
+ ISO=agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
+ REPO_0=agama-installer.s390x-9.0.0-openSUSE-Build17.9 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9 \
+ VERSION=agama-9.0 \
+ _OBSOLETE=1
+
diff --git a/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before b/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before
new file mode 100644
index 00000000..46d31199
--- /dev/null
+++ b/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before
@@ -0,0 +1,6 @@
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//iso/images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//iso/images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256
+[ -d /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9 ] || {
+    mkdir /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9
+    bsdtar xf /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso -C /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9
+}
diff --git a/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_repo.before b/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_repo.before
new file mode 100644
index 00000000..e69de29b
diff --git a/xml/obs/systemsmanagement:Agama:Devel.xml b/xml/obs/systemsmanagement:Agama:Devel.xml
index a157f315..a3981458 100644
--- a/xml/obs/systemsmanagement:Agama:Devel.xml
+++ b/xml/obs/systemsmanagement:Agama:Devel.xml
@@ -2,9 +2,11 @@
     project_pattern="systemsmanagement:Agama:Devel"
     dist_path="obspublish-other::openqa/systemsmanagement:Agama:Devel/"
     distri="opensuse"
-    version="agama-9.0"
-    archs="x86_64 aarch64 ppc64le s390x">
-    <flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/">
-        <hdd filemask="agama-installer.*-openSUSE-Build.*iso$"/>
-    </flavor>
+    version="agama-9.0">
+    <batch name="base" archs="86_64 aarch64 ppc64le">
+        <flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/" iso="1" media1="0"/>
+    </batch>
+    <batch name="s390x" archs="s390x" iso_path="iso">
+	<flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/" iso="extract_as_repo" media1="0"/>
+    </batch>
 </openQA>