diff --git a/opensuse-leap-image/_multibuild b/opensuse-leap-image/_multibuild
index 07060e8..d43b471 100644
--- a/opensuse-leap-image/_multibuild
+++ b/opensuse-leap-image/_multibuild
@@ -1,4 +1,4 @@
 <multibuild>
   <flavor>docker</flavor>
-  <flavor>lxc</flavor>
+  <flavor>networkd</flavor>
 </multibuild>
diff --git a/opensuse-leap-image/config.kiwi b/opensuse-leap-image/config.kiwi
index 8f2cd1e..9abc895 100644
--- a/opensuse-leap-image/config.kiwi
+++ b/opensuse-leap-image/config.kiwi
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!-- OBS-Profiles: @BUILD_FLAVOR@ -->
+<!-- So that Dockerfile builds derived from this use the project paths -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 <!-- OBS-ExcludeArch: i586 -->
 
-<image schemaversion="6.5" name="opensuse-leap-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.4" name="opensuse-leap-image">
   <description type="system">
     <author>Fabian Vogt</author>
     <contact>fvogt@suse.com</contact>
@@ -12,6 +13,8 @@
   </description>
   <profiles>
     <profile name="docker" description="Docker-compatible image"/>
+    <profile name="lxc" description="LXC-compatible image"/>
+    <profile name="networkd" description="Image with systemd-networkd, suitable for use in systemd-machined"/>
   </profiles>
   <preferences profiles="docker">
     <type image="docker">
@@ -21,7 +24,7 @@
         additionaltags="%OS_VERSION_ID%.%RELEASE%"
         maintainer="Fabian Vogt &lt;fvogt@suse.com&gt;">
         <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.base">
+          <suse_label_helper:add_prefix xmlns:suse_label_helper="com.suse.label_helper" prefix="org.opensuse.base">
             <label name="org.opencontainers.image.title" value="openSUSE Leap %OS_VERSION_ID% Base Container"/>
             <label name="org.opencontainers.image.description" value="Image containing a minimal environment for containers based on openSUSE Leap %OS_VERSION_ID%."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID%.%RELEASE%"/>
@@ -34,6 +37,7 @@
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
           </suse_label_helper:add_prefix>
         </labels>
+        <history author="Fabian Vogt &lt;fvogt@suse.com&gt;">openSUSE Leap %OS_VERSION_ID% Base Container</history>
       </containerconfig>
     </type>
     <version>16.0.0</version>
@@ -57,20 +61,18 @@
   <repository>
     <source path="obsrepositories:/"/>
   </repository>
-  <packages type="image" profiles="networkd">
+  <packages type="bootstrap" profiles="networkd">
     <package name="systemd"/>
     <package name="systemd-networkd"/>
     <package name="systemd-resolved"/>
     <package name="systemd-sysvinit"/>
     <package name="iproute2"/>
-    <package name="openSUSE-repos"/>
   </packages>
-  <packages type="image" profiles="lxc">
+  <packages type="bootstrap" profiles="lxc">
     <package name="systemd"/>
     <package name="systemd-sysvinit"/>
     <package name="wicked"/>
     <package name="iproute2"/>
-    <package name="openSUSE-repos"/>
   </packages>
   <packages type="bootstrap">
     <package name="aaa_base"/>
@@ -87,10 +89,10 @@
     <package name="lsb-release"/>
     <package name="netcfg"/>
     <package name="openssl"/>
-    <package name="patterns-base-fips"/>
     <package name="openSUSE-build-key"/>
-    <package name="openSUSE-release"/>
+    <package name="Leap-release"/>
     <package name="Leap-release-appliance-docker"/>
+    <package name="openSUSE-repos"/>
     <package name="patterns-base-minimal_base"/>
     <package name="patterns-base-fips"/>
     <package name="procps"/>
diff --git a/opensuse-leap-image/config.sh b/opensuse-leap-image/config.sh
index 7d8848b..028727b 100644
--- a/opensuse-leap-image/config.sh
+++ b/opensuse-leap-image/config.sh
@@ -13,11 +13,8 @@ suseImportBuildKey
 
 # don't have multiple licenses of the same type
 jdupes -1 -L -r /usr/share/licenses
-
-#======================================
-# openSUSE-repos-* now provide repos
-#--------------------------------------
 zypper --non-interactive rm -u jdupes
+
 # Not needed, but neither rpm nor libzypp handle rpmlib(X-CheckUnifiedSystemdir) yet
 # which would avoid it being installed by the filesystem package
 rpm -e compat-usrmerge-tools
diff --git a/opensuse-leap-image/opensuse-leap-image.changes b/opensuse-leap-image/opensuse-leap-image.changes
index 767235c..07ccf7a 100644
--- a/opensuse-leap-image/opensuse-leap-image.changes
+++ b/opensuse-leap-image/opensuse-leap-image.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug 26 13:35:47 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Rebase config.kiwi on opensuse-tumbleweed-image
+- Enable the networkd image instead of the lxc image in _multibuild
+- Use only <packages type="bootstrap"/>, as openSUSE-repos breaks
+  zypper calls inside kiwi once it's installed
+
 -------------------------------------------------------------------
 Mon Aug 18 13:56:30 UTC 2025 - Lubos Kocman <lubos.kocman@suse.com>