diff --git a/meson.build b/meson.build
index acab81df4c..014eaeef1b 100644
--- a/meson.build
+++ b/meson.build
@@ -2372,6 +2372,7 @@ subdir('src/libsystemd-network')
 
 subdir('src/ac-power')
 subdir('src/analyze')
+subdir('src/ask-password')
 subdir('src/backlight')
 subdir('src/battery-check')
 subdir('src/binfmt')
@@ -2421,6 +2422,7 @@ subdir('src/pstore')
 subdir('src/random-seed')
 subdir('src/rc-local-generator')
 subdir('src/remount-fs')
+subdir('src/reply-password')
 subdir('src/resolve')
 subdir('src/rfkill')
 subdir('src/rpm')
@@ -2437,6 +2439,7 @@ subdir('src/sysv-generator')
 subdir('src/timedate')
 subdir('src/timesync')
 subdir('src/tmpfiles')
+subdir('src/tty-ask-password-agent')
 subdir('src/user-sessions')
 subdir('src/userdb')
 subdir('src/vconsole')
@@ -2611,34 +2614,6 @@ if want_tests != 'false'
                      systemd_id128.full_path()])
 endif
 
-public_programs += executable(
-        'systemd-ask-password',
-        'src/ask-password/ask-password.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-executable(
-        'systemd-reply-password',
-        'src/reply-password/reply-password.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : userspace,
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-public_programs += executable(
-        'systemd-tty-ask-password-agent',
-        'src/tty-ask-password-agent/tty-ask-password-agent.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
 public_programs += executable(
         'systemd-cgls',
         'src/cgls/cgls.c',
diff --git a/src/ask-password/meson.build b/src/ask-password/meson.build
new file mode 100644
index 0000000000..3197112ebc
--- /dev/null
+++ b/src/ask-password/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-ask-password',
+                'public' : true,
+                'sources' : files('ask-password.c'),
+        },
+]
diff --git a/src/reply-password/meson.build b/src/reply-password/meson.build
new file mode 100644
index 0000000000..ace112c946
--- /dev/null
+++ b/src/reply-password/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-reply-password',
+                'sources' : files('reply-password.c'),
+        },
+]
diff --git a/src/tty-ask-password-agent/meson.build b/src/tty-ask-password-agent/meson.build
new file mode 100644
index 0000000000..ad0c73bc4e
--- /dev/null
+++ b/src/tty-ask-password-agent/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-tty-ask-password-agent',
+                'public' : true,
+                'sources' : files('tty-ask-password-agent.c'),
+        },
+]