9 files changed, 17 insertions, 9 deletions
diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
index ced3ea4108..fc90285561 100644
--- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
@@ -3,13 +3,14 @@
 [Match]
 Distribution=arch
 
-[Content]
+[Build]
 Environment=
         GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
         GIT_BRANCH=main
         GIT_COMMIT=d5a2dc54dad2bcfefa1032cc95823f1acedfcb4c
         PKG_SUBDIR=arch
 
+[Content]
 Packages=
         base
         base-devel
diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
index 1efca6d4b2..0f4a79652c 100644
--- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -4,13 +4,14 @@
 Distribution=|centos
 Distribution=|fedora
 
-[Content]
+[Build]
 Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
         GIT_BRANCH=rawhide
         GIT_COMMIT=a67221c3f0d0b81b9b5b3230a71d09044342f1a4
         PKG_SUBDIR=fedora
 
+[Content]
 Packages=
         compiler-rt
         git-core
diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
index 29727d7e22..2351aaa6ce 100644
--- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
@@ -4,7 +4,7 @@
 Distribution=|debian
 Distribution=|ubuntu
 
-[Content]
+[Build]
 Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
         GIT_SUBDIR=debian
@@ -12,6 +12,7 @@ Environment=
         GIT_COMMIT=51389fefcabae6d1e28153fed84a5e69a9147b19
         PKG_SUBDIR=debian
 
+[Content]
 Packages=
         apt
         erofs-utils
diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
index 0b17435672..a4882df8b1 100644
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
@@ -3,13 +3,14 @@
 [Match]
 Distribution=opensuse
 
-[Content]
+[Build]
 Environment=
         GIT_URL=https://src.opensuse.org/pool/systemd
         GIT_BRANCH=factory
         GIT_COMMIT=612bc16021b28ab99002fa1069f1ec97124397a25c7a207d013213b5cfb86055
         PKG_SUBDIR=opensuse
 
+[Content]
 Packages=
         diffutils
         erofs-utils
diff --git a/mkosi.images/exitrd/mkosi.conf b/mkosi.images/exitrd/mkosi.conf
index 28da8a592b..ea4fc806bf 100644
--- a/mkosi.images/exitrd/mkosi.conf
+++ b/mkosi.images/exitrd/mkosi.conf
@@ -13,5 +13,5 @@ MakeInitrd=yes
 Packages=
         bash
 
-[Config]
+[Include]
 Include=%D/mkosi.sanitizers
diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi.images/initrd/mkosi.conf
index 3f2c5c77ce..ca28c123af 100644
--- a/mkosi.images/initrd/mkosi.conf
+++ b/mkosi.images/initrd/mkosi.conf
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Config]
+[Include]
 Include=
         mkosi-initrd
         %D/mkosi.sanitizers
diff --git a/mkosi.images/minimal-0/mkosi.conf b/mkosi.images/minimal-0/mkosi.conf
index 5ef80b8bc7..5d6717f897 100644
--- a/mkosi.images/minimal-0/mkosi.conf
+++ b/mkosi.images/minimal-0/mkosi.conf
@@ -7,7 +7,9 @@ Dependencies=minimal-base
 Format=portable
 SplitArtifacts=yes
 
+[Build]
+Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
+
 [Content]
 BaseTrees=%O/minimal-base
-Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
 Bootable=no
diff --git a/mkosi.images/minimal-1/mkosi.conf b/mkosi.images/minimal-1/mkosi.conf
index 5ef80b8bc7..5d6717f897 100644
--- a/mkosi.images/minimal-1/mkosi.conf
+++ b/mkosi.images/minimal-1/mkosi.conf
@@ -7,7 +7,9 @@ Dependencies=minimal-base
 Format=portable
 SplitArtifacts=yes
 
+[Build]
+Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
+
 [Content]
 BaseTrees=%O/minimal-base
-Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
 Bootable=no
diff --git a/mkosi.images/minimal-base/mkosi.conf b/mkosi.images/minimal-base/mkosi.conf
index d841f9b76b..56040f8b21 100644
--- a/mkosi.images/minimal-base/mkosi.conf
+++ b/mkosi.images/minimal-base/mkosi.conf
@@ -15,5 +15,5 @@ Packages=
         grep
         util-linux
 
-[Config]
+[Include]
 Include=%D/mkosi.sanitizers