diff --git a/install/devtoolbox-run-script b/install/devtoolbox-run-script
new file mode 100644
index 0000000..d1dd18d
--- /dev/null
+++ b/install/devtoolbox-run-script
@@ -0,0 +1,7 @@
+#! /bin/sh
+# Copyright (C) 2022 - 2023 Alessandro Iepure
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+export TMPDIR="$XDG_RUNTIME_DIR/app/me.iepure.devtoolbox"
+exec /app/bin/devtoolbox-bin "$@"
diff --git a/me.iepure.devtoolbox.json b/me.iepure.devtoolbox.json
index b003957..2ca49ba 100644
--- a/me.iepure.devtoolbox.json
+++ b/me.iepure.devtoolbox.json
@@ -9,8 +9,7 @@
         "--share=ipc",
         "--socket=fallback-x11",
         "--device=dri",
-        "--socket=wayland",
-        "--filesystem=/tmp"
+        "--socket=wayland"
     ],
     "cleanup" : [
         "/include",
@@ -29,6 +28,10 @@
             "name" : "devtoolbox",
             "builddir" : true,
             "buildsystem" : "meson",
+            "post-install": [
+                "mv /app/bin/devtoolbox /app/bin/devtoolbox-bin",
+                "install -Dm755 /app/devtoolbox/devtoolbox-run-script /app/bin/devtoolbox"
+            ],
             "sources" : [
                 {
                     "type" : "git",
diff --git a/meson.build b/meson.build
index 062e16f..4a9f743 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,8 @@ subdir('data')
 subdir('src')
 subdir('po')
 
+install_data('install/devtoolbox-run-script', install_dir: join_paths(get_option('prefix'), meson.project_name()))
+
 gnome.post_install(
      glib_compile_schemas: true,
     gtk_update_icon_cache: true,