diff --git a/automation_tools/flatpak_build_bundle.sh b/automation_tools/flatpak_build_bundle.sh
index 0ad6ea4f..cef69eff 100755
--- a/automation_tools/flatpak_build_bundle.sh
+++ b/automation_tools/flatpak_build_bundle.sh
@@ -2,10 +2,8 @@
 
 # This is building the bundle RetroDECK.flatpak after the download and build steps are done
 
-if [[ "${GITHUB_REF##*/}" == "main" ]]; then
-    flatpak = "RetroDECK.flatpak"
+if [ "${GITHUB_REF##*/}" = "main" ]; then
+    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 else
-    flatpak = "RetroDECK-cooker.flatpak"
-fi
-
-flatpak build-bundle "${GITHUB_WORKSPACE}/local" "${flatpak}" net.retrodeck.retrodeck
+    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
+fi
\ No newline at end of file
diff --git a/net.retrodeck.retrodeck.Configurator.desktop b/net.retrodeck.retrodeck.Configurator.desktop
index 89c01fff..1d45d4a4 100644
--- a/net.retrodeck.retrodeck.Configurator.desktop
+++ b/net.retrodeck.retrodeck.Configurator.desktop
@@ -4,7 +4,7 @@ GenericName=RetroDECK Configuration Utility
 Type=Application
 Comment=A handy tool to change common RetroDECK settings
 Icon=net.retrodeck.retrodeck
-Exec=/app/tools/configurator.sh
+Exec=/bin/bash /app/tools/configurator.sh
 Terminal=false
 StartupNotify=false
 Keywords=multi;engine;emulator;standalone;steam;deck
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 6e80f682..93affa66 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -4,7 +4,7 @@
    <id>net.retrodeck.retrodeck</id>
    <launchable type="desktop-id">net.retrodeck.retrodeck.desktop</launchable>
    <name>RetroDECK</name>
-   <summary>RetroDECK brings an environment to catalog and play your retro games directly on your Steam Deck.</summary>
+   <summary>RetroDECK brings an environment to catalog and play your retro games directly on your Steam Deck</summary>
    <developer_name>RetroDECK Team</developer_name>
    <url type="homepage">https://retrodeck.net</url>
    <url type="bugtracker">https://github.com/XargonWan/RetroDECK/issues</url>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 78880ccd..55a0fa83 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1334,6 +1334,7 @@ modules:
       # Desktop entries
       - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop
       - cp net.retrodeck.retrodeck.Configurator.desktop /app/share/applications/net.retrodeck.retrodeck.Configurator.desktop
+      - chmod +x net.retrodeck.retrodeck*desktop
 
       # Initializing default emulator configs
       - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/
@@ -1349,6 +1350,10 @@ modules:
       - mkdir -p ${FLATPAK_DEST}/share/appdata
       - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata
 
+      # Creating symlinks for a prettier access
+      - ln -s /app/bin/retrodeck.sh /app/bin/retrodeck
+      - ln -s /app/tools/configurator.sh /app/bin/configurator
+
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git