diff --git a/mkosi.presets/system/mkosi.conf b/mkosi.presets/system/mkosi.conf
index aab7a13dbc2..2474d7f847b 100644
--- a/mkosi.presets/system/mkosi.conf
+++ b/mkosi.presets/system/mkosi.conf
@@ -8,7 +8,7 @@ Dependencies=base
 Autologin=yes
 BaseTrees=../../mkosi.output/base
 ExtraTrees=../../mkosi.output/base-systemd
-ExtraTrees=../../src:/root/src
+ExtraTrees=../../src:/usr/src/src
 Initrds=../../mkosi.output/initrd
 Packages=
         acl
diff --git a/mkosi.presets/system/mkosi.extra/root/.gdbinit b/mkosi.presets/system/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb
similarity index 57%
rename from mkosi.presets/system/mkosi.extra/root/.gdbinit
rename to mkosi.presets/system/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb
index 1a2163e3a54..598344809c1 100644
--- a/mkosi.presets/system/mkosi.extra/root/.gdbinit
+++ b/mkosi.presets/system/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb
@@ -1,3 +1,3 @@
 set debuginfod enabled off
 set build-id-verbose 0
-set substitute-path ../src /root/src
+set substitute-path ../src /usr/src