diff --git a/emu-configs/ryujinx/ryujinx-rdwrapper.sh b/emu-configs/ryujinx/ryujinx-rdwrapper.sh
deleted file mode 100755
index 7865db7e..00000000
--- a/emu-configs/ryujinx/ryujinx-rdwrapper.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-source /app/libexec/global.sh
-
-log i "Ryujinx RetroDECK wrapper: starting"
-command="$1"
-manage_ryujinx_keys
-log d "Ryujinx RetroDECK wrapper: launching \"Ryujinx.sh $command\""
-Ryujinx.sh "$command"
\ No newline at end of file
diff --git a/functions/functions.sh b/functions/functions.sh
index c7641735..b040fc73 100644
--- a/functions/functions.sh
+++ b/functions/functions.sh
@@ -620,43 +620,6 @@ easter_eggs() {
   cp -f "$new_splash_file" "$current_splash_file" # Deploy assigned splash screen
 }
 
-manage_ryujinx_keys() {
-  # This function checks if Switch keys are existing and symlinks them inside the Ryujinx system folder
-  # If the symlinks are broken it recreates them
-
-  log i "Checking Ryujinx Switch keys."
-  local ryujinx_system="/var/config/Ryujinx/system"  # Set the path to the Ryujinx system folder
-  # Check if the keys folder exists
-  if [ -d "$bios_folder/switch/keys" ]; then
-      # Check if there are files in the keys folder
-      if [ -n "$(find "$bios_folder/switch/keys" -maxdepth 1 -type f)" ]; then
-          # Iterate over each file in the keys folder
-          for file in "$bios_folder/switch/keys"/*; do
-              local filename=$(basename "$file")
-              local symlink="$ryujinx_system/$filename"
-              
-              # Check if the symlink exists and is valid
-              if [ -L "$symlink" ] && [ "$(readlink -f "$symlink")" = "$file" ]; then
-                  log i "Found \"$symlink\" and it's a valid symlink."
-                  continue  # Skip if the symlink is already valid
-              fi
-              
-              # Remove broken symlink or non-symlink file
-              log w "Found \"$symlink\" but it's not a valid symlink. Repairing it"
-              [ -e "$symlink" ] && rm "$symlink"
-
-              # Create symlink
-              ln -s "$file" "$symlink"
-              log i "Created symlink: \"$symlink\""
-          done
-      else
-          log w "No files found in $bios_folder/switch/keys. Continuing..."
-      fi
-  else
-      log e "Directory $bios_folder/switch/keys does not exist. Something is wrong with your RetroDECK installation. Continuing but Ryujinx will not be able to run any game."
-  fi
-}
-
 ponzu() {
   # This function is used to extract some specific appimages
   # Check if any of the specified files exist
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 003c72fa..8d97b1a4 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -602,6 +602,7 @@ prepare_component() {
         dir_prep "$saves_folder/switch/ryujinx/nand" "/var/config/Ryujinx/bis"
         dir_prep "$saves_folder/switch/ryujinx/sdcard" "/var/config/Ryujinx/sdcard"
         dir_prep "$bios_folder/switch/firmware" "/var/config/Ryujinx/bis/system/Contents/registered"
+        dir_prep "$bios_folder/switch/keys" "/var/config/Ryujinx/system"
       fi
     fi
     # if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 35a55bf0..62bb93b1 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1304,10 +1304,6 @@ modules:
       - cp emu-configs/gzdoom/gzdoom.sh ${FLATPAK_DEST}/bin/gzdoom.sh
       - chmod +x ${FLATPAK_DEST}/bin/gzdoom.sh
 
-      # Ryujinx wrapper
-      - cp emu-configs/ryujinx/ryujinx-rdwrapper.sh ${FLATPAK_DEST}/bin/ryujinx-rdwrapper.sh
-      - chmod +x ${FLATPAK_DEST}/bin/ryujinx-rdwrapper.sh
-
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
diff --git a/tools/configurator.sh b/tools/configurator.sh
index f45c27fc..c23788dc 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -527,7 +527,7 @@ configurator_open_emulator_dialog() {
 
   "Ryujinx" )
     log i "Configurator: \"$emulator\""
-    ryujinx-rdwrapper.sh
+    Ryujinx.sh
   ;;
 
   "Vita3K" )