diff --git a/src/builder-manifest.c b/src/builder-manifest.c
index 08c42050..35fdf545 100644
--- a/src/builder-manifest.c
+++ b/src/builder-manifest.c
@@ -1802,6 +1802,7 @@ command (GFile      *app_dir,
   g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
 
+  g_ptr_array_add (args, g_strdup ("--die-with-parent"));
   g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
   if (extra_args)
     {
@@ -1981,6 +1982,7 @@ appstream_compose (GFile   *app_dir,
   args = g_ptr_array_new_with_free_func (g_free);
   g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
+  g_ptr_array_add (args, g_strdup ("--die-with-parent"));
   g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
   g_ptr_array_add (args, g_file_get_path (app_dir));
   g_ptr_array_add (args, g_strdup ("appstream-compose"));
@@ -3244,6 +3246,7 @@ builder_manifest_run (BuilderManifest *self,
   args = g_ptr_array_new_with_free_func (g_free);
   g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
+  g_ptr_array_add (args, g_strdup ("--die-with-parent"));
 
   build_dir_path = g_file_get_path (builder_context_get_build_dir (context));
   g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/%s=%s",
diff --git a/src/builder-module.c b/src/builder-module.c
index 1314fcdd..9c35057b 100644
--- a/src/builder-module.c
+++ b/src/builder-module.c
@@ -1010,6 +1010,7 @@ setup_build_args (GFile          *app_dir,
   args = g_ptr_array_new_with_free_func (g_free);
   g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
+  g_ptr_array_add (args, g_strdup ("--die-with-parent"));
 
   source_dir_path_canonical = realpath (source_dir_path, NULL);
   if (source_dir_path_canonical == NULL)
diff --git a/src/builder-source-shell.c b/src/builder-source-shell.c
index 5e8a56ab..8009ed6b 100644
--- a/src/builder-source-shell.c
+++ b/src/builder-source-shell.c
@@ -129,6 +129,7 @@ run_script (BuilderContext *context,
   args = g_ptr_array_new_with_free_func (g_free);
   g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
+  g_ptr_array_add (args, g_strdup ("--die-with-parent"));
 
   source_dir_path_canonical = realpath (source_dir_path, NULL);