diff --git a/build-tests/arm/ubuntu/test-image-rpi/appliance.kiwi b/build-tests/arm/ubuntu/test-image-rpi/appliance.kiwi
index 578ddb9b..dd7eae2a 100644
--- a/build-tests/arm/ubuntu/test-image-rpi/appliance.kiwi
+++ b/build-tests/arm/ubuntu/test-image-rpi/appliance.kiwi
@@ -31,13 +31,13 @@
     </users>
 
     <repository type="apt-deb" alias="kiwi-next-generation" priority="1" repository_gpgcheck="false">
-        <source path="obs://Virtualization:Appliances:Builder/xUbuntu_23.10"/>
+        <source path="obs://Virtualization:Appliances:Builder/xUbuntu_23.04"/>
     </repository>
-    <repository type="apt-deb" alias="Ubuntu-Mantic-Universe" distribution="mantic" components="main multiverse restricted universe" repository_gpgcheck="false">
-        <source path="obs://Ubuntu:23.10/universe"/>
+    <repository type="apt-deb" alias="Ubuntu-Lunar-Universe" distribution="lunar" components="main multiverse restricted universe" repository_gpgcheck="false">
+        <source path="obs://Ubuntu:23.04/universe"/>
     </repository>
-    <repository type="apt-deb" alias="Ubuntu-Mantic" distribution="mantic" components="main multiverse restricted universe" repository_gpgcheck="false">
-        <source path="obs://Ubuntu:23.10/standard"/>
+    <repository type="apt-deb" alias="Ubuntu-Lunar" distribution="lunar" components="main multiverse restricted universe" repository_gpgcheck="false">
+        <source path="obs://Ubuntu:23.04/standard"/>
     </repository>
     
     <packages type="image">
diff --git a/build-tests/x86/ubuntu/test-image-docker/appliance.kiwi b/build-tests/x86/ubuntu/test-image-docker/appliance.kiwi
index b2b25c58..cd9157af 100644
--- a/build-tests/x86/ubuntu/test-image-docker/appliance.kiwi
+++ b/build-tests/x86/ubuntu/test-image-docker/appliance.kiwi
@@ -24,13 +24,13 @@
         <user name="vagrant" password="vh4vw1N4alxKQ" home="/home/vagrant" groups="vagrant"/>
     </users>
     <repository type="apt-deb" alias="kiwi-next-generation" priority="1" repository_gpgcheck="false">
-        <source path="obs://Virtualization:Appliances:Staging/xUbuntu_23.10"/>
+        <source path="obs://Virtualization:Appliances:Staging/xUbuntu_23.04"/>
     </repository>
-    <repository type="apt-deb" alias="Ubuntu-Mantic-Universe" distribution="mantic" components="main multiverse restricted universe" repository_gpgcheck="false">
-        <source path="obs://Ubuntu:23.10/universe"/>
+    <repository type="apt-deb" alias="Ubuntu-Lunar-Universe" distribution="lunar" components="main multiverse restricted universe" repository_gpgcheck="false">
+        <source path="obs://Ubuntu:23.04/universe"/>
     </repository>
-    <repository type="apt-deb" alias="Ubuntu-Mantic" distribution="mantic" components="main multiverse restricted universe" repository_gpgcheck="false">
-        <source path="obs://Ubuntu:23.10/standard"/>
+    <repository type="apt-deb" alias="Ubuntu-Lunar" distribution="lunar" components="main multiverse restricted universe" repository_gpgcheck="false">
+        <source path="obs://Ubuntu:23.04/standard"/>
     </repository>
     <packages type="image">
         <package name="gnupg"/>
diff --git a/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi b/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi
index 3bc6c71d..78c115c7 100644
--- a/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi
+++ b/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi
@@ -52,13 +52,13 @@
         <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
     </users>
     <repository type="apt-deb" alias="kiwi-next-generation" priority="1" repository_gpgcheck="false">
-        <source path="obs://Virtualization:Appliances:Staging/xUbuntu_23.10"/>
+        <source path="obs://Virtualization:Appliances:Staging/xUbuntu_23.04"/>
     </repository>
-    <repository type="apt-deb" alias="Ubuntu-Mantic-Universe" distribution="mantic" components="main multiverse restricted universe" repository_gpgcheck="false">
-        <source path="obs://Ubuntu:23.10/universe"/>
+    <repository type="apt-deb" alias="Ubuntu-Lunar-Universe" distribution="lunar" components="main multiverse restricted universe" repository_gpgcheck="false">
+        <source path="obs://Ubuntu:23.04/universe"/>
     </repository>
-    <repository type="apt-deb" alias="Ubuntu-Mantic" distribution="mantic" components="main multiverse restricted universe" repository_gpgcheck="false">
-        <source path="obs://Ubuntu:23.10/standard"/>
+    <repository type="apt-deb" alias="Ubuntu-Lunar" distribution="lunar" components="main multiverse restricted universe" repository_gpgcheck="false">
+        <source path="obs://Ubuntu:23.04/standard"/>
     </repository>
     <packages type="image">
         <package name="grub2-themes-ubuntu-mate"/>