diff --git a/wiki-rtd/docs/wiki_emulator_guides/rpcs3-guide.md b/wiki-rtd/docs/wiki_emulator_guides/rpcs3-guide.md
new file mode 100644
index 00000000..ad97f834
--- /dev/null
+++ b/wiki-rtd/docs/wiki_emulator_guides/rpcs3-guide.md
@@ -0,0 +1,123 @@
+# Guide: RPCS3 - Playstation 3
+
+## Where to put the games?
+PS3 games comes either as a Blu-ray rip directory (folder) with a bunch of different files or a digital PSN title that needs to be installed (see guide on this page).
+
+PS3 games should be put under the `retrodeck/roms/ps3/` directory.
+
+### Official RPCS3 guide and wiki:
+
+**Guide:**
+
+https://rpcs3.net/quickstart
+
+**Wiki:**
+
+https://wiki.rpcs3.net/index.php?title=Main_Page
+
+## Does RPCS3 require BIOS or Firmware?
+Yes, the `PS3UPDAT.PUP` firmware
+
+### How to: Install the PS3UPDAT.PUP firmware
+
+There are two ways to install the firmware:
+
+#### Install PS3 firmware from RetroDECK Configurator
+
+1. Open RPCS3 `RetroDECK Configurator` - `RetroDECK: Tools` - `Install: PS3 Firmware`.
+2. Press `OK` and this will download the PS3 Firmware and open RPCS3.
+3. You will get a prompt asking if you want to install the firmware from the /tmp/ folder, say `Yes`
+4. Wait for the installation to finish
+5. Exit RPCS3 from the GUI under `File -> Exit`
+
+#### Manual Download
+1. Download the latest PS3 firmware `PS3UPDAT.PUP` from Sony [here](https://www.playstation.com/en-us/support/hardware/ps3/system-software/)
+2. Open RPCS3 `RetroDECK Configurator -> Open Emulator -> RPCS3`.
+3. In the RPCS3 interface navigate to `File -> Install Firmware`.
+4. In the file browser navigate and select the file `PS3UPDAT.PUP` file.
+5. The firmware should now be installed.
+
+
+
+## How to: Get games to show up inside the ES-DE interface
+
+There are two methods of adding the games
+
+Read more here:
+https://gitlab.com/es-de/emulationstation-de/-/blob/master/USERGUIDE.md#sony-playstation-3
+
+### Method 1: Game shortcuts .desktop files
+
+This method can be used for all types rips/dumps both directories and .iso files.
+
+1. Open RPCS3 via the Configurator
+2. Click File -> Add Game -> Browse to game you want to add.
+3. The game will now show up in the RPCS3 game list.
+4. Rightclick on that list.
+5. This will create a shortcut to the game.
+6. Move that shortcut into the roms/ps3 folder.
+
+### Method 2: Directories as .pd3 files
+This method can only be used directory type game dumps.
+To get the games to show up you need to rename the directory to end with a `.ps3` file extension.
+
+_Example:_
+
+You have directory dump of the a game Blu-ray PlayStation 3 game called Hockey World, the directory is called `Hockey World`.
+
+To get the it to show up you need to rename and add `.ps3` in the end of the directory name.
+
+The directory `Hockey World` becomes `Hockey World.ps3` and the game will show up.
+
+
+## How to: Install DLC or patches on disc based games
+
+**NOTE:** On the Steam Deck this could be easier to do in `Desktop Mode`. If you want to do it in `Game Mode` you need to press the `Steam` button and switch between windows using the window switcher.
+
+If you want to install some DLC or patch you can do that trough RPCS3 itself.
+
+1. Open RPCS3 `RetroDECK Configurator -> Open Emulator -> RPCS3`.
+2. In the RPCS3 interface navigate to `File -> Install Packages/Raps/Edats`.
+3. In the file browser navigate and select the file you want to install.
+4. The file will be installed inside the a new game directory on the RPCS3 hard drive under
+ `retrodeck/bios/rpcs3/dev_hdd0/game/GAMEID` where `GAMEID` is unique for each game [PS3GAMEID-List](https://www.gametdb.com/PS3/List).
+5. The patches or dlc should now be installed and in the GAMEID directory.
+6. Move the content of the GAMEID directory into the games directory inside the `retrodeck/roms/ps3/GAMENAME.ps3` directory and overwrite & replace the files.
+8. You can now remove the `retrodeck/bios/rpcs3/dev_hdd0/game/GAMEID` directory as the files have been moved.
+9. The game can be launched inside the ES-DE interface with patches and DLC installed.
+
+_Example:_
+
+The game `Hockey World.ps3` inside the `retrodeck/roms/ps3/` has some DLC & and a patch you want to install.
+
+You follow the above guide and install the files.
+
+The installation made a newly created directory called `BCA111111` under `retrodeck/bios/rpcs3/dev_hdd0/game/`.
+
+You open up the directory `retrodeck/bios/rpcs3/dev_hdd0/game/BCA111111` and copy all of it's content and paste it into `retrodeck/roms/ps3/Hockey World.ps3` directory and replace/overwrite the files.
+
+You can then remove the `BCA111111` directory in `retrodeck/bios/rpcs3/dev_hdd0/game/`
+
+## How to: Install digital PSN titles
+
+**NOTE:** On the Steam Deck this could be easier to do in `Desktop Mode`. If you want to do it in `Game Mode` you need to press the `Steam` button and switch between windows using the window switcher.
+
+If you want to install some PSN tiltes you can do that trough RPCS3 itself.
+
+1. Open RPCS3 `RetroDECK Configurator -> Open Emulator -> RPCS3`.
+2. In the RPCS3 interface navigate to `File -> Install Packages/Raps/Edats`.
+3. In the file browser navigate and select the file you want to install.
+4. The file will be installed inside the games directory on the RPCS3 hard drive under
+ `retrodeck/bios/rpcs3/dev_hdd0/game/GAMEID` where `GAMEID` is unique for each game [PS3GAMEID-List](https://www.gametdb.com/PS3/List).
+5. Install any patches or DLC for the game by repeating step .2 and .3 for each file.
+6. After the game is ready move the digital games directory from `retrodeck/bios/rpcs3/dev_hdd0/game/GAMEID` to `retrodeck/roms/ps3`
+7. Rename the directory to the name of the game and add the .ps3 file extension to the end of the directory (see guide on top).
+8. The game should now show up and be playable inside the ES-DE interface.
+
+
+_Example:_
+
+You installed a file that contained the digital game Hockey World 2, it created a directory called `BCA123456` under `retrodeck/bios/rpcs3/dev_hdd0/game/`
+
+After that you moved `BCA123456` from `retrodeck/bios/rpcs3/dev_hdd0/game/` to `retrodeck/roms/ps3`.
+The directory `BCA123456` is renamed to `Hockey World 2.ps3`.
diff --git a/wiki-rtd/docs/wiki_emulator_guides/yuzu-guide.md b/wiki-rtd/docs/wiki_emulator_guides/yuzu-guide.md
new file mode 100644
index 00000000..573b8520
--- /dev/null
+++ b/wiki-rtd/docs/wiki_emulator_guides/yuzu-guide.md
@@ -0,0 +1,74 @@
+# Guide: Yuzu - Switch
+
+## Official guide and wiki:
+**Guide:**
+
+https://yuzu-emu.org/help/quickstart/
+
+**Wiki:**
+
+https://yuzu-emu.org/wiki/
+
+## Where to put the games?
+Switch games should be put into the `retrodeck/roms/switch/` directory.
+The games can come in many different formats: `XCI` `NSP` `NCA` `NSO` `NRO`.
+
+# Does Yuzu require BIOS or Firmware?
+Yes, `prod.keys` `title.keys` and `nca` files.
+
+## Where do I put the BIOS and firmware files?
+Yuzu needs the key files `prod.keys`, `title.keys` and the firmware files in the following directories:
+
+**Yuzu keys:** `~/retrodeck/bios/switch/keys`
+
+**Yuzu firmware:** `~/retrodeck/bios/switch/registered`
+
+The directory tree should look like this example:
+```
+~/retrodeck/bios/switch
+├── keys
+│ ├── prod.keys
+│ └── title.keys
+└── registered
+ ├── 02259fd41066eddbc64e0fdd217d9d2f.nca
+ ├── 02582a2cd46cc226ce72c8a52504cd97.nca
+ ├── 02b1dd519a6df4de1b11871851d328a1.nca
+ ├── other 217 files...
+ └── fd0d23003ea5602c24ac4e41101c16fd.nca
+```
+
+You can find a complete guide in the [Yuzu official wiki](https://yuzu-emu.org/help/quickstart/#downloading-and-installing-yuzu) on how to extract the BIOS from your Switch.
+
+# How do I install DLC and Updates?
+
+**Requirements:** Patch or DLC files
+
+**NOTE:** On the Steam Deck this could be easier to do in `Desktop Mode`.
+
+1. Extract any patch or dlc files from compressed `.zip` or any other format to the true files.
+2. Open up Yuzu inside `RetroDECK Configurator` by pressing `Open Emulator` - `Yuzu`.
+3. Press `File` - `Install Files to NAND`
+4. Find a DLC or Patch file from the file browser and press `Open`
+5. This will install the DLC or Patch file into the games NAND folder inside of Yuzu.
+6. Repeat step 2 to 3 for every file you need to install.
+7. Quit Yuzu
+8. Start up RetroDECK and select the game you want to play.
+
+# How do I add shader caches?
+
+**Requirements:** Shader cache files
+
+**NOTE:** On the Steam Deck this could be easier to do in `Desktop Mode`.
+
+1. Extract any shader cache files from compressed `.zip` or any other format to folders.
+2. Open up Yuzu inside `RetroDECK Configurator` by pressing `Open Emulator` - `Yuzu`.
+3. Right click on the game you want to add mods into.
+4. Click on `Open Transferable Pipeline Cache`.
+5. Paste the files inside that directory.
+6. Start up RetroDECK and select the game.
+
+# How do I add mods?
+Check the Mods: Yuzu section on this wiki
+
+[[Mods: Switch ‐ Yuzu]]
+
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 01c231c1..a053da8b 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -41,8 +41,8 @@ nav:
- Texture Packs - RetroArch Mupen64Plus: wiki_texture_packs/retroarch-mupen64plus-tp.md
- Emulator Guides:
- - Linux Desktop - Installation and Updates: wiki_devices/linux_desktop/linux-install.md
- - Linux Desktop - Software Recommendations: wiki_devices/linux_desktop/linux-software.md
+ - RPCS3: wiki_emulator_guides/rpcs3-guide.md
+ - Yuzu: wiki_emulator_guides/yuzu-guide.md
- Controllers and Input 🎮:
- RetroDECK with Steam Input: wiki_controllers/about-steam-input.md