diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index f48f4f24..e590f709 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -1613,7 +1613,7 @@
     <system>
         <name>tools</name>
         <fullname>RetroDECK Tools</fullname>
-        <path>/var/config/retrodeck/tools</path>
+        <path>/app/bin/tools</path>
         <extension>.sh .SH</extension>
         <command>bash %ROM%</command>
         <platform>tools</platform>
diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml
index 3e2cad3c..c1a8f052 100644
--- a/es-configs/tools-gamelist.xml
+++ b/es-configs/tools-gamelist.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <gameList>
 	<game>
-		<path>/app/bin/configurator.sh</path>
+		<path>./configurator.sh</path>
 		<name>RetroDECK Configurator</name>
 		<desc>Change settings, move folders and more!</desc>
 		<nogamecount>true</nogamecount>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 5321750e..492dc8b8 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1061,14 +1061,15 @@ modules:
       - cp -f res/splash.svg ${FLATPAK_DEST}/emulationstation/graphics/splash-orig.svg
       - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
 
-      # Tools
-      - mv -f es-configs/tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/
-
-      # Launchable scripts
+      # RetroDECK core script
       - cp retrodeck.sh /app/bin/retrodeck.sh
       - chmod +x /app/bin/retrodeck.sh
-      - cp tools/configurator.sh /app/bin/configurator.sh
+
+      # Tools
+      - mkdir -p /app/bin/tools
+      - cp tools/configurator.sh /app/bin/tools/configurator.sh
       - chmod +x /app/bin/configurator.sh
+      - cp es-configs/tools-gamelist.xml /app/bin/tools/tools-gamelist.xml
 
       # Function libraries
       - mkdir -p /app/libexec