diff --git a/flatpak/org.fn2006.PollyMC.yml b/flatpak/org.fn2006.PollyMC.yml
index efbe8b436..fe5a10eb5 100644
--- a/flatpak/org.fn2006.PollyMC.yml
+++ b/flatpak/org.fn2006.PollyMC.yml
@@ -32,6 +32,8 @@ finish-args:
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
     # Mod drag&drop
   - --filesystem=xdg-download:ro
+  - --env=PATH=/app/bin:/usr/bin:/app/utils/gamescope/bin:/app/utils/mangohud/bin
+  - --env=VK_LAYER_PATH=/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d
 
 cleanup:
   - /lib/libGLU*
@@ -167,3 +169,8 @@ modules:
         path: prime-run
       - type: file
         path: pollymc
+
+  - name: extensions
+    buildsystem: simple
+    build-commands:
+      - mkdir -p ${FLATPAK_DEST}/utils/{gamescope,mangohud}
diff --git a/flatpak/pollymc b/flatpak/pollymc
index 84813bccf..589bbc643 100644
--- a/flatpak/pollymc
+++ b/flatpak/pollymc
@@ -5,7 +5,4 @@ for i in {0..9}; do
     test -S "$XDG_RUNTIME_DIR"/discord-ipc-"$i" || ln -sf {app/com.discordapp.Discord,"$XDG_RUNTIME_DIR"}/discord-ipc-"$i";
 done
 
-export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin"
-export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/"
-
 exec /app/bin/pollyrun "$@"