diff --git a/script/cfg.py b/script/cfg.py
index 754c385..fb0f129 100644
--- a/script/cfg.py
+++ b/script/cfg.py
@@ -391,6 +391,7 @@ def openqa_call_extra(repos):
                 ''' + openqa_call_build_id_from_iso2(build_id_from_iso) + '''
                 [[ $repo =~ license ]] || echo " REPO_REPOPREFIX$repoKey=$repoDest \\\\"
                 ''' + openqa_call_extra(repos) + '''
+                [ $i != 0 ] || ''' + openqa_call_repo0() + '''
                 : $((i++))
             done < <(grep $repot$additional_repo_suffix __envsub/files_repo.lst | grep REPOTYPE | grep $arch | sort)
         done'''
diff --git a/script/scriptgen.py b/script/scriptgen.py
index 1f3c851..115461d 100644
--- a/script/scriptgen.py
+++ b/script/scriptgen.py
@@ -1095,15 +1095,25 @@ def gen_print_openqa(self, f):
         self.p(" i={}".format(i), f)
 
         if self.repos or self.repolink:
+            sl = ""
             if self.ag.brand == "ibs":
                 self.p(" i=9", f)  # temporary to simplify diff with old rsync scripts, may be removed later
-            # some trickery for REPO_SLE_ vs REPO_SL_ variables in ibs
-            sl = "SLE_"
+                # some trickery for REPO_SLE_ vs REPO_SL_ variables in ibs
+                sl = "SLE_"
             for r in self.repos:
                 if r.tag.startswith("SL"):
                     sl = ""
                     break
-            self.p(cfg.openqa_call_repot(self.build_id_from_iso, self.repos), f, "REPOTYPE", "''", "REPOPREFIX", sl)
+            self.p(
+                cfg.openqa_call_repot(self.build_id_from_iso, self.repos),
+                f,
+                "REPOTYPE",
+                "''",
+                "REPOPREFIX",
+                sl,
+                "REPO0_ISO",
+                "$repoDest",
+            )
 
         repodirs = self.repodirs
         if not repodirs and self.repolink:
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 966d7b3..eff8b22 100644
--- a/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before
+++ b/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before
@@ -5,9 +5,14 @@
  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 \
+ FULLURL=1 \
  ISO=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
@@ -18,9 +23,14 @@
  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 \
+ FULLURL=1 \
  ISO=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
@@ -31,9 +41,14 @@
  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 \
+ FULLURL=1 \
  ISO=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
@@ -44,9 +59,14 @@
  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 \
+ FULLURL=1 \
  ISO=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
@@ -57,9 +77,14 @@
  CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-aarch64-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=offline-installer \
+ FULLURL=1 \
  ISO=Leap-16.0-offline-installer-aarch64-Build1.3.install.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
@@ -70,9 +95,14 @@
  CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-x86_64-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=offline-installer \
+ FULLURL=1 \
  ISO=Leap-16.0-offline-installer-x86_64-Build1.3.install.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
@@ -83,9 +113,14 @@
  CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-ppc64le-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=offline-installer \
+ FULLURL=1 \
  ISO=Leap-16.0-offline-installer-ppc64le-Build1.3.install.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1
 
@@ -96,9 +131,14 @@
  CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-s390x-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=offline-installer \
+ FULLURL=1 \
  ISO=Leap-16.0-offline-installer-s390x-Build1.3.install.iso \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
  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 \
+ REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
  VERSION=16.0 \
  _OBSOLETE=1