diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst b/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst
index 4e3f02f3..31c74aae 100644
--- a/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst
+++ b/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst
@@ -1,6 +1,6 @@
-agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso
-agama-installer-Leap.aarch64-9.0.0-openSUSE-PXE-Build2.4.install.iso
-agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso
-agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso
-agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso
-agama-installer-Leap.x86_64-9.0.0-openSUSE-PXE-Build2.4.install.iso
+agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso
+agama-installer-Leap.aarch64-16.0.0-Leap-PXE-Build1.3.install.iso
+agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso
+agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso
+agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso
+agama-installer-Leap.x86_64-16.0.0-Leap-PXE-Build1.3.install.iso
diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before b/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before
index c84c37ee..4c5dfe92 100644
--- a/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before
+++ b/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before
@@ -1,52 +1,52 @@
 /usr/bin/openqa-cli api -X post isos?async=1 \
  ARCH=aarch64 \
- ASSET_256=agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256 \
- BUILD=2.4 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ ASSET_256=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 \
+ BUILD=1.3 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=agama-installer-Leap \
- ISO=agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso \
- REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
- REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
+ ISO=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso \
+ REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
 /usr/bin/openqa-cli api -X post isos?async=1 \
  ARCH=x86_64 \
- ASSET_256=agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256 \
- BUILD=2.4 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ ASSET_256=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 \
+ BUILD=1.3 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=agama-installer-Leap \
- ISO=agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso \
- REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
- REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
+ ISO=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso \
+ REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
 /usr/bin/openqa-cli api -X post isos?async=1 \
  ARCH=ppc64le \
- ASSET_256=agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso.sha256 \
- BUILD=2.4 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ ASSET_256=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 \
+ BUILD=1.3 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=agama-installer-Leap \
- ISO=agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso \
- REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
- REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
+ ISO=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso \
+ REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
 /usr/bin/openqa-cli api -X post isos?async=1 \
  ARCH=s390x \
- ASSET_256=agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso.sha256 \
- BUILD=2.4 \
- CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ ASSET_256=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 \
+ BUILD=1.3 \
+ CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=agama-installer-Leap \
- ISO=agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso \
- REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
- REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \
+ ISO=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso \
+ REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before
index 4e03570f..360cfee7 100644
--- a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before
+++ b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before
@@ -1,8 +1,8 @@
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso.sha256
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256
diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before
index e4a6fab9..40b323ac 100644
--- a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before
+++ b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before
@@ -1,3 +1,3 @@
 # Leap-16.0-aarch64-ppc64le-s390x-x86_64$
 rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/product/local/000productcompose/Leap-16.0-aarch64-ppc64le-s390x-x86_64/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3/