diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index b5aed1dd..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-openSUSE-20240610-aarch64-Media1.license
-openSUSE-20240610-aarch64-Media1
-openSUSE-20240610-aarch64-Media2
-openSUSE-20240610-aarch64-Media3
-openSUSE-20240610-armv7hl-Media1.license
-openSUSE-20240610-armv7hl-Media1
-openSUSE-20240610-armv7hl-Media2
-openSUSE-20240610-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/print_openqa.before
index 276a9b2a..105e2fc4 100644
--- a/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/base-dvd/print_openqa.before
@@ -9,19 +9,19 @@
  FLAVOR=DVD \
  FULLURL=1 \
  ISO=openSUSE-Tumbleweed-DVD-aarch64-Snapshot20240610-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/base/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/base/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/base/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/base/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/base/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index b5aed1dd..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/base/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-openSUSE-20240610-aarch64-Media1.license
-openSUSE-20240610-aarch64-Media1
-openSUSE-20240610-aarch64-Media2
-openSUSE-20240610-aarch64-Media3
-openSUSE-20240610-armv7hl-Media1.license
-openSUSE-20240610-armv7hl-Media1
-openSUSE-20240610-armv7hl-Media2
-openSUSE-20240610-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/base/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/base/print_openqa.before
index 78f81a0f..f9fc2f61 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/base/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/base/print_openqa.before
@@ -7,19 +7,19 @@
  FLAVOR=NET \
  FULLURL=1 \
  ISO=openSUSE-Tumbleweed-NET-aarch64-Snapshot20240610-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -32,19 +32,19 @@
  FLAVOR=NET \
  FULLURL=1 \
  ISO=openSUSE-Tumbleweed-NET-armv7hl-Snapshot20240610-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-armv7hl.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/base/print_rsync_repo.before b/t/obs/openSUSE:Factory:ARM:ToTest/base/print_rsync_repo.before
index c73b73c5..5c77cae8 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/base/print_rsync_repo.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/base/print_rsync_repo.before
@@ -1,16 +1,8 @@
-rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*aarch64*/*Media1.license/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64.license-CURRENT/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64.license-Snapshot20240610
-rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*aarch64*/*Media1/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610
-rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*armv7hl*/*Media1.license/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl.license-CURRENT/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl.license-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl.license-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl.license-Snapshot20240610
-rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*armv7hl*/*Media1/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610
-rsync --timeout=3600 -rtlp4 --delete --specials --include=java* --include=kernel-default-debug* --include=kernel-default-base-debug* --include=mraa-debug* --include=wicked-debug* --exclude=aarch64/* --exclude=armv7hl/* --exclude=i586/* --exclude=i686/* --exclude=noarch/* --exclude=nosrc/* --exclude=ppc64/* --exclude=ppc64le/* --exclude=s390x/* --exclude=src/* --exclude=x86_64/* obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*aarch64*/*Media2/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT-debuginfo/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo
-rsync --timeout=3600 -rtlp4 --delete --specials --include=java* --include=kernel-default-debug* --include=kernel-default-base-debug* --include=mraa-debug* --include=wicked-debug* --exclude=aarch64/* --exclude=armv7hl/* --exclude=i586/* --exclude=i686/* --exclude=noarch/* --exclude=nosrc/* --exclude=ppc64/* --exclude=ppc64le/* --exclude=s390x/* --exclude=src/* --exclude=x86_64/* obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*armv7hl*/*Media2/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT-debuginfo/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-debuginfo
-rsync --timeout=3600 -rtlp4 --delete --specials --include=coreutils* --include=yast2-network* --exclude=aarch64/* --exclude=armv7hl/* --exclude=i586/* --exclude=i686/* --exclude=noarch/* --exclude=nosrc/* --exclude=ppc64/* --exclude=ppc64le/* --exclude=s390x/* --exclude=src/* --exclude=x86_64/* obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*aarch64*/*Media3/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT-source/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT-source/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-CURRENT-source/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source
-rsync --timeout=3600 -rtlp4 --delete --specials --include=coreutils* --include=yast2-network* --exclude=aarch64/* --exclude=armv7hl/* --exclude=i586/* --exclude=i686/* --exclude=noarch/* --exclude=nosrc/* --exclude=ppc64/* --exclude=ppc64le/* --exclude=s390x/* --exclude=src/* --exclude=x86_64/* obspublish::openqa/openSUSE:Factory:ARM:ToTest/*images/local/*openSUSE-ftp-ftp*armv7hl*/*Media3/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT-source/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT-source/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-CURRENT-source/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-source
+rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:ARM:ToTest/images/local/0openSUSE/openSUSE-20240610-armv6hl-armv7hl-aarch64/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610
+rsync --timeout=3600 -rtlp4 --delete --specials --include=java* --include=kernel-default-debug* --include=kernel-default-base-debug* --include=mraa-debug* --include=wicked-debug* --exclude=aarch64/* --exclude=armv7hl/* --exclude=i586/* --exclude=i686/* --exclude=noarch/* --exclude=nosrc/* --exclude=ppc64/* --exclude=ppc64le/* --exclude=s390x/* --exclude=src/* --exclude=x86_64/* obspublish::openqa/openSUSE:Factory:ARM:ToTest/images/local/0openSUSE/openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT-Debug/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT-Debug/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT-Debug/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug
+rsync --timeout=3600 -rtlp4 --delete --specials --include=coreutils* --include=yast2-network* --exclude=aarch64/* --exclude=armv7hl/* --exclude=i586/* --exclude=i686/* --exclude=noarch/* --exclude=nosrc/* --exclude=ppc64/* --exclude=ppc64le/* --exclude=s390x/* --exclude=src/* --exclude=x86_64/* obspublish::openqa/openSUSE:Factory:ARM:ToTest/images/local/0openSUSE/openSUSE-20250610-armv6hl-armv7hl-aarch64-Source/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT-Source/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT-Source/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-CURRENT-Source/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source
+rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:ARM:ToTest/images/local/0openSUSE/openSUSE-20250610-armv6hl-armv7hl-aarch64.license/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-CURRENT/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index b5aed1dd..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-openSUSE-20240610-aarch64-Media1.license
-openSUSE-20240610-aarch64-Media1
-openSUSE-20240610-aarch64-Media2
-openSUSE-20240610-aarch64-Media3
-openSUSE-20240610-armv7hl-Media1.license
-openSUSE-20240610-armv7hl-Media1
-openSUSE-20240610-armv7hl-Media2
-openSUSE-20240610-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/print_openqa.before
index f27fee57..e6a8a2f8 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-aarch64/print_openqa.before
@@ -7,19 +7,19 @@
  FLAVOR=JeOS-for-AArch64 \
  FULLURL=1 \
  HDD_1=openSUSE-Tumbleweed-ARM-JeOS-efi.aarch64-2024.05.15-Snapshot20240610.raw.xz \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -34,19 +34,19 @@
  FLAVOR=JeOS-for-RPi \
  FULLURL=1 \
  HDD_1=openSUSE-Tumbleweed-ARM-JeOS-raspberrypi.aarch64-2024.05.15-Snapshot20240610.raw.xz \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -59,19 +59,19 @@
  FLAVOR=JeOS-for-OpenStack-Cloud \
  FULLURL=1 \
  HDD_1=openSUSE-Tumbleweed-Minimal-VM.aarch64-1.0.0-Cloud-Snapshot20240610.qcow2 \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index b5aed1dd..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-openSUSE-20240610-aarch64-Media1.license
-openSUSE-20240610-aarch64-Media1
-openSUSE-20240610-aarch64-Media2
-openSUSE-20240610-aarch64-Media3
-openSUSE-20240610-armv7hl-Media1.license
-openSUSE-20240610-armv7hl-Media1
-openSUSE-20240610-armv7hl-Media2
-openSUSE-20240610-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/print_openqa.before
index 681b98f0..b6545a11 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/jeos-armv7hl/print_openqa.before
@@ -7,19 +7,19 @@
  FLAVOR=JeOS-for-AArch64 \
  FULLURL=1 \
  HDD_1=openSUSE-Tumbleweed-ARM-JeOS-efi.armv7l-2024.05.15-Snapshot20240610.raw.xz \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-armv7hl.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -32,19 +32,19 @@
  FLAVOR=JeOS-for-RPi \
  FULLURL=1 \
  HDD_1=openSUSE-Tumbleweed-ARM-JeOS-raspberrypi2.armv7l-2024.05.15-Snapshot20240610.raw.xz \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- REPO_1=openSUSE-Tumbleweed-oss-armv7hl.license-Snapshot20240610 \
- REPO_2=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20240610 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv7hl-Snapshot20240610 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20240610 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/live/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/live/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/live/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/live/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/live/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index 560c4b88..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/live/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-openSUSE-20200115-aarch64-Media1
-openSUSE-20200115-aarch64-Media2
-openSUSE-20200115-aarch64-Media3
-openSUSE-20200115-armv7hl-Media1
-openSUSE-20200115-armv7hl-Media2
-openSUSE-20200115-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/live/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/live/print_openqa.before
index 33648379..0eae6223 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/live/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/live/print_openqa.before
@@ -7,18 +7,19 @@
  FLAVOR=Rescue-CD \
  FULLURL=1 \
  ISO=openSUSE-Tumbleweed-Rescue-CD-aarch64-Snapshot20200115-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20200115 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -31,18 +32,19 @@
  FLAVOR=GNOME-Live \
  FULLURL=1 \
  ISO=openSUSE-Tumbleweed-GNOME-Live-aarch64-Snapshot20200115-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20200115 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -55,18 +57,19 @@
  FLAVOR=KDE-Live \
  FULLURL=1 \
  ISO=openSUSE-Tumbleweed-KDE-Live-aarch64-Snapshot20200115-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20200115 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -79,18 +82,19 @@
  FLAVOR=XFCE-Live \
  FULLURL=1 \
  ISO=openSUSE-Tumbleweed-XFCE-Live-aarch64-Snapshot20200115-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20200115 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20200115 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20200115 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index 560c4b88..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-openSUSE-20200115-aarch64-Media1
-openSUSE-20200115-aarch64-Media2
-openSUSE-20200115-aarch64-Media3
-openSUSE-20200115-armv7hl-Media1
-openSUSE-20200115-armv7hl-Media2
-openSUSE-20200115-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/print_openqa.before
index 6e811f47..5420d8c0 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/microos-qcow/print_openqa.before
@@ -7,18 +7,19 @@
  FLAVOR=MicroOS-Image \
  FULLURL=1 \
  HDD_1=openSUSE-MicroOS.aarch64-16.0.0-kvm-and-xen-Snapshot20231022.qcow2 \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20231022 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -31,18 +32,19 @@
  FLAVOR=MicroOS-Image-sdboot \
  FULLURL=1 \
  HDD_1=openSUSE-MicroOS.aarch64-16.0.0-kvm-and-xen-sdboot-Snapshot20231022.qcow2 \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20231022 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
@@ -55,18 +57,19 @@
  FLAVOR=MicroOS-Image-ContainerHost \
  FULLURL=1 \
  HDD_1=openSUSE-MicroOS.aarch64-16.0.0-ContainerHost-kvm-and-xen-Snapshot20231022.qcow2 \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20231022 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20231022 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20231022 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/microos/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/microos/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/microos/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/microos/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/microos/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index 560c4b88..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/microos/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-openSUSE-20200115-aarch64-Media1
-openSUSE-20200115-aarch64-Media2
-openSUSE-20200115-aarch64-Media3
-openSUSE-20200115-armv7hl-Media1
-openSUSE-20200115-armv7hl-Media2
-openSUSE-20200115-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/microos/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/microos/print_openqa.before
index fcc07bcb..d04a6fc3 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/microos/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/microos/print_openqa.before
@@ -7,18 +7,19 @@
  FLAVOR=DVD \
  FULLURL=1 \
  ISO=openSUSE-MicroOS-DVD-aarch64-Snapshot20221106-Media.iso \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106 \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106 \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20221106 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106 \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20221106 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20221106 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/wsl/files_repo_0openSUSE.lst b/t/obs/openSUSE:Factory:ARM:ToTest/wsl/files_repo_0openSUSE.lst
new file mode 100644
index 00000000..c3185dd1
--- /dev/null
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/wsl/files_repo_0openSUSE.lst
@@ -0,0 +1,4 @@
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Debug
+openSUSE-20250610-armv6hl-armv7hl-aarch64-Source
+openSUSE-20250610-armv6hl-armv7hl-aarch64.license
+openSUSE-20240610-armv6hl-armv7hl-aarch64
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/wsl/files_repo_openSUSE-ftp-ftp.lst b/t/obs/openSUSE:Factory:ARM:ToTest/wsl/files_repo_openSUSE-ftp-ftp.lst
deleted file mode 100755
index 560c4b88..00000000
--- a/t/obs/openSUSE:Factory:ARM:ToTest/wsl/files_repo_openSUSE-ftp-ftp.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-openSUSE-20200115-aarch64-Media1
-openSUSE-20200115-aarch64-Media2
-openSUSE-20200115-aarch64-Media3
-openSUSE-20200115-armv7hl-Media1
-openSUSE-20200115-armv7hl-Media2
-openSUSE-20200115-armv7hl-Media3
diff --git a/t/obs/openSUSE:Factory:ARM:ToTest/wsl/print_openqa.before b/t/obs/openSUSE:Factory:ARM:ToTest/wsl/print_openqa.before
index 14dafcfd..134b06eb 100755
--- a/t/obs/openSUSE:Factory:ARM:ToTest/wsl/print_openqa.before
+++ b/t/obs/openSUSE:Factory:ARM:ToTest/wsl/print_openqa.before
@@ -7,18 +7,19 @@
  DISTRI=opensuse \
  FLAVOR=WSL \
  FULLURL=1 \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx \
- REPO_1=openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx-debuginfo \
- REPO_2=openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx-source \
- REPO_OSS=openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx-debuginfo \
- REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx-source \
+ REPO_0=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx \
+ REPO_1=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx-Debug \
+ REPO_2=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx-Source \
+ REPO_3=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64.license-Snapshot20230902.appx \
+ REPO_OSS=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx \
+ REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx-Debug \
+ REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx-Source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-aarch64-Snapshot20230902.appx \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64-Snapshot20230902.appx \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/xml/obs/openSUSE:Factory:ARM.xml b/xml/obs/openSUSE:Factory:ARM.xml
index d5ebbebf..4aa7ed13 100644
--- a/xml/obs/openSUSE:Factory:ARM.xml
+++ b/xml/obs/openSUSE:Factory:ARM.xml
@@ -1,10 +1,13 @@
 <openQA
     project_pattern="openSUSE:(?P&lt;version&gt;Factory):ARM:ToTest"
-    distri="opensuse">
+    distri="opensuse"
+    repo_path="images/local"
+    media1="0"
+    >
     <batch name="base" archs="aarch64 armv7hl">
         <flavor name="Tumbleweed-NET" folder="images/local/*product*" iso="1">
             <repos>
-                <oss folder="images/local/*openSUSE-ftp-ftp" debug="{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}" source="{coreutils*,yast2-network*}" mirror="1" dest="openSUSE-Tumbleweed-oss-$arch"/>
+                <oss folder="0openSUSE" debug="{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}" source="{coreutils*,yast2-network*}" mirror="1" dest="openSUSE-Tumbleweed-oss-armv6hl-armv7hl-aarch64"/>
             </repos>
         </flavor>
     </batch>