diff --git a/t/obs/openSUSE:Factory:zSystems:ToTest/print_rsync_repo.before b/t/obs/openSUSE:Factory:zSystems:ToTest/print_rsync_repo.before
index 7ab5102..2a5a380 100644
--- a/t/obs/openSUSE:Factory:zSystems:ToTest/print_rsync_repo.before
+++ b/t/obs/openSUSE:Factory:zSystems:ToTest/print_rsync_repo.before
@@ -1,10 +1,10 @@
-rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x/ /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss--Snapshot20200115
-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:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x-Debug/ /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT-Debug/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT-Debug/ /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT-Debug/ /var/lib/openqa/factory/repo/Tumbleweed-oss--Snapshot20200115-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:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x-Source/ /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT-Source/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT-Source/ /var/lib/openqa/factory/repo/Tumbleweed-oss--CURRENT-Source/ /var/lib/openqa/factory/repo/Tumbleweed-oss--Snapshot20200115-Source
-rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x.license/ /var/lib/openqa/factory/repo/Tumbleweed-oss-.license-CURRENT/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss-.license-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss-.license-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss-.license-Snapshot20200115
-rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:zSystems:ToTest/images/local/0NonFree/openSUSE-Addon-NonOss-20250730-s390x/ /var/lib/openqa/factory/repo/Tumbleweed-non-oss--CURRENT/
-rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-non-oss--CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-non-oss--CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-non-oss--Snapshot20200115
+rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-Snapshot20200115
+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:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x-Debug/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT-Debug/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT-Debug/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT-Debug/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-Snapshot20200115-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:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x-Source/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT-Source/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT-Source/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-CURRENT-Source/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x-Snapshot20200115-Source
+rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:zSystems:ToTest/images/local/0openSUSE/openSUSE-20250730-s390x.license/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x.license-CURRENT/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x.license-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x.license-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-oss-s390x.license-Snapshot20200115
+rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Factory:zSystems:ToTest/images/local/0NonFree/openSUSE-Addon-NonOss-20250730-s390x/ /var/lib/openqa/factory/repo/Tumbleweed-non-oss-s390x-CURRENT/
+rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Tumbleweed-non-oss-s390x-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-non-oss-s390x-CURRENT/ /var/lib/openqa/factory/repo/Tumbleweed-non-oss-s390x-Snapshot20200115
diff --git a/xml/obs/openSUSE:Factory:zSystems.xml b/xml/obs/openSUSE:Factory:zSystems.xml
index ee8fd5f..5c77612 100644
--- a/xml/obs/openSUSE:Factory:zSystems.xml
+++ b/xml/obs/openSUSE:Factory:zSystems.xml
@@ -5,8 +5,8 @@
     media1="0">
     <flavor name="Tumbleweed-DVD" folder="images/local/*product*" iso="1" archs="s390x">
         <repos>
-            <oss folder="0openSUSE" debug="{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}" source="{coreutils*,yast2-network*}" mirror="1" dest="Tumbleweed-oss-$arch"/>
-            <non-oss folder="0NonFree" dest="Tumbleweed-non-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="Tumbleweed-oss-s390x"/>
+            <non-oss folder="0NonFree" dest="Tumbleweed-non-oss-s390x"/>
         </repos>
     </flavor>
 </openQA>