diff --git a/recipes-fixes/systemd/systemd-compat-units_dora.inc b/recipes-fixes/systemd/systemd-compat-units_dora.inc
new file mode 100644
index 0000000..9cc0c9e
--- /dev/null
+++ b/recipes-fixes/systemd/systemd-compat-units_dora.inc
@@ -0,0 +1,6 @@
+# In dora a SRC_URI = "file://*.service" is done and that doesn't work
+# when playing with the FILESPATH
+SRC_URI = "\
+	file://machineid.service \
+	file://run-postinsts.service \
+	"
diff --git a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
index b8e86fe..3f4a08a 100644
--- a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
@@ -5,11 +5,8 @@ SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking"
 
 S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
-SRC_URI = "\
-	file://machineid.service \
-	file://run-postinsts.service \
-	file://alignment.service"
 
+SRC_URI += "file://alignment.service"
 
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system/basic.target.wants
@@ -19,3 +16,5 @@ do_install_append() {
 	ln -sf ../alignment.service ${D}${systemd_unitdir}/system/basic.target.wants/
 	ln -sf ../alignment.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
 }
+
+FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
diff --git a/recipes-fixes/systemd/systemd_sysmocom-206.inc b/recipes-fixes/systemd/systemd_sysmocom-206.inc
new file mode 100644
index 0000000..c60cb95
--- /dev/null
+++ b/recipes-fixes/systemd/systemd_sysmocom-206.inc
@@ -0,0 +1,3 @@
+SRC_URI += " \
+            file://0001-RFC-fsck-Allow-to-specify-the-fsck-repair-option-in-.patch \
+	"
diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc
index 817a60f..ba573c7 100644
--- a/recipes-fixes/systemd/systemd_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd_sysmocom.inc
@@ -1,11 +1,10 @@
 S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
-PRINC="23"
+PRINC="24"
 
 SRC_URI += "file://journald.conf \
             file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch \
-            file://0001-RFC-fsck-Allow-to-specify-the-fsck-repair-option-in-.patch \
            "
 
 SRC_URI_append_sysmobts-v1 = " file://system.conf"
diff --git a/yocto-dora/systemd-compat-units.bbappend b/yocto-dora/systemd-compat-units.bbappend
index d76e8d1..b2b70a8 100644
--- a/yocto-dora/systemd-compat-units.bbappend
+++ b/yocto-dora/systemd-compat-units.bbappend
@@ -1,2 +1,3 @@
+require recipes-fixes/systemd/${PN}_dora.inc
 require recipes-fixes/systemd/${PN}_sysmocom.inc
 
diff --git a/yocto-dora/systemd_206.bbappend b/yocto-dora/systemd_206.bbappend
index 9e03591..b5369a7 100644
--- a/yocto-dora/systemd_206.bbappend
+++ b/yocto-dora/systemd_206.bbappend
@@ -1 +1,2 @@
+require recipes-fixes/${PN}/${PN}_sysmocom-${PV}.inc
 require recipes-fixes/${PN}/${PN}_sysmocom.inc