diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index fe7b623b..c711110b 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -985,6 +985,10 @@ modules:
         - cp retrodeck.sh /app/bin/retrodeck.sh
         - chmod +x /app/bin/retrodeck.sh
 
+        # Configuring Yuzu
+        sed -i -e 's/Paths\romsPath=*' -e 's/Paths\romsPath=~/retrodeck/roms/switch' /var/config/yuzu/qt-config.ini
+        sed -i -e 's/Screenshots\screenshot_path=*' -e 's/Screenshots\screenshot_path=~/retrodeck/screenshots/' /var/config/yuzu/qt-config.ini
+
         # Desktop entry
         - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop
 
diff --git a/retrodeck.sh b/retrodeck.sh
index d3598eb0..26feea8c 100755
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -37,6 +37,7 @@ then
     # Cleaning
     rm -rf /var/config/emulationstation/
     rm /var/config/retrodeck/tools/*
+    rm -f /var/config/yuzu/qt-config.ini
 
     kdialog --title "RetroDECK" --msgbox "EmulationStation will now initialize the system, please don't edit the roms location, just select:\n\nCREATE DIRECTORIES, YES, QUIT\n\nRetroDECK will manage the rest."
 
@@ -64,6 +65,7 @@ then
     rm -rf /var/config/retroarch/system
     ln -s ~/retrodeck/bios /var/config/retroarch/system
 
+    # This should become a sed in the future
     cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg
 
     mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/
@@ -72,6 +74,11 @@ then
     mkdir -p /var/config/retroarch/cores/
     cp /app/share/libretro/cores/* /var/config/retroarch/cores/
 
+    # Initializing Yuzu
+    mkdir -p ~/retrodeck/bios/switch/keys
+    ln -s ~/retrodeck/bios/switch/keys /var/data/yuzu/keys
+    ln -s /var/data/yuzu/registered ~/retrodeck/bios/switch/registered
+
     touch ~/retrodeck/.lock
 
     kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n~/retrodeck/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access."