diff --git a/meson.build b/meson.build
index 5dd5f348aa..733390ae8f 100644
--- a/meson.build
+++ b/meson.build
@@ -2424,6 +2424,10 @@ foreach dict : executables
                 continue
         endif
 
+        if name.endswith('.standalone') and not have_standalone_binaries
+                continue
+        endif
+
         kwargs = {}
         foreach key, val : dict
                 if key in ['name', 'dbus', 'public', 'conditions',
diff --git a/src/repart/meson.build b/src/repart/meson.build
index 9c5778dffd..369410bab8 100644
--- a/src/repart/meson.build
+++ b/src/repart/meson.build
@@ -22,7 +22,7 @@ executables += [
         },
         executable_template + {
                 'name' : 'systemd-repart.standalone',
-                'public' : have_standalone_binaries,
+                'public' : true,
                 'sources' : files('repart.c'),
                 'c_args' : '-DSTANDALONE',
                 'link_with' : [
@@ -37,8 +37,6 @@ executables += [
                         libopenssl,
                         threads,
                 ],
-                'build_by_default' : have_standalone_binaries,
-                'install' : have_standalone_binaries,
         },
 ]
 
diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
index c91253ca8e..c67d19abcc 100644
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -28,8 +28,6 @@ executables += [
                         libsystemd_static,
                 ],
                 'dependencies' : libmount,
-                'build_by_default' : have_standalone_binaries,
-                'install' : have_standalone_binaries,
         },
         test_template + {
                 'sources' : files('test-umount.c'),
diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build
index c968f55110..88494d8cfc 100644
--- a/src/sysusers/meson.build
+++ b/src/sysusers/meson.build
@@ -13,7 +13,7 @@ executables += [
         },
         executable_template + {
                 'name' : 'systemd-sysusers.standalone',
-                'public' : have_standalone_binaries,
+                'public' : true,
                 'sources' : files('sysusers.c'),
                 'c_args' : '-DSTANDALONE',
                 'link_with' : [
@@ -22,7 +22,5 @@ executables += [
                         libsystemd_static,
                 ],
                 'dependencies' : libaudit,
-                'build_by_default' : have_standalone_binaries,
-                'install' : have_standalone_binaries,
         },
 ]
diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
index 1016573969..404f265f91 100644
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -21,7 +21,7 @@ executables += [
         },
         executable_template + {
                 'name' : 'systemd-tmpfiles.standalone',
-                'public' : have_standalone_binaries,
+                'public' : true,
                 'sources' : systemd_tmpfiles_sources + systemd_tmpfiles_extract_sources,
                 'c_args' : '-DSTANDALONE',
                 'link_with' : [
@@ -30,8 +30,6 @@ executables += [
                         libsystemd_static,
                 ],
                 'dependencies' : libacl,
-                'build_by_default' : have_standalone_binaries,
-                'install' : have_standalone_binaries,
         },
         test_template + {
                 'sources' : files('test-offline-passwd.c'),