diff --git a/meson.build b/meson.build
index f94889b09a..f3319d3451 100644
--- a/meson.build
+++ b/meson.build
@@ -2382,6 +2382,8 @@ subdir('src/cryptsetup')
 subdir('src/debug-generator')
 subdir('src/dissect')
 subdir('src/environment-d-generator')
+subdir('src/firstboot')
+subdir('src/fsck')
 subdir('src/fstab-generator')
 subdir('src/getty-generator')
 subdir('src/gpt-auto-generator')
@@ -2395,6 +2397,7 @@ subdir('src/kernel-install')
 subdir('src/locale')
 subdir('src/login')
 subdir('src/machine')
+subdir('src/machine-id-setup')
 subdir('src/network')
 subdir('src/nspawn')
 subdir('src/nss-myhostname')
@@ -2407,6 +2410,7 @@ subdir('src/portable')
 subdir('src/pstore')
 subdir('src/random-seed')
 subdir('src/rc-local-generator')
+subdir('src/remount-fs')
 subdir('src/resolve')
 subdir('src/rfkill')
 subdir('src/rpm')
@@ -2584,47 +2588,6 @@ meson.add_install_script(meson_make_symlink,
                          bindir / 'udevadm',
                          libexecdir / 'systemd-udevd')
 
-if conf.get('ENABLE_FIRSTBOOT') == 1
-        public_programs += executable(
-                'systemd-firstboot',
-                'src/firstboot/firstboot.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libcrypt,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true)
-endif
-
-executable(
-        'systemd-remount-fs',
-        'src/remount-fs/remount-fs.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-executable(
-        'systemd-machine-id-setup',
-        'src/machine-id-setup/machine-id-setup-main.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-executable(
-        'systemd-fsck',
-        'src/fsck/fsck.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
 executable(
         'systemd-growfs',
         'src/partition/growfs.c',
diff --git a/src/firstboot/meson.build b/src/firstboot/meson.build
new file mode 100644
index 0000000000..28c1d2703a
--- /dev/null
+++ b/src/firstboot/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-firstboot',
+                'public' : true,
+                'conditions' : ['ENABLE_FIRSTBOOT'],
+                'sources' : files('firstboot.c'),
+                'dependencies' : libcrypt,
+        },
+]
diff --git a/src/fsck/meson.build b/src/fsck/meson.build
new file mode 100644
index 0000000000..e85e8c06a0
--- /dev/null
+++ b/src/fsck/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-fsck',
+                'sources' : files('fsck.c'),
+        },
+]
diff --git a/src/machine-id-setup/meson.build b/src/machine-id-setup/meson.build
new file mode 100644
index 0000000000..316165a54e
--- /dev/null
+++ b/src/machine-id-setup/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-machine-id-setup',
+                'sources' : files('machine-id-setup-main.c'),
+        },
+]
diff --git a/src/remount-fs/meson.build b/src/remount-fs/meson.build
new file mode 100644
index 0000000000..8761d25418
--- /dev/null
+++ b/src/remount-fs/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-remount-fs',
+                'sources' : files('remount-fs.c'),
+        },
+]