diff --git a/emu-configs/config.yml b/emu-configs/rpcs3/config.yml
similarity index 87%
rename from emu-configs/config.yml
rename to emu-configs/rpcs3/config.yml
index b57d6713..b8555168 100644
--- a/emu-configs/config.yml
+++ b/emu-configs/rpcs3/config.yml
@@ -11,18 +11,21 @@ Core:
   Thread Scheduler Mode: Operating System
   Set DAZ and FTZ: false
   SPU Decoder: Recompiler (LLVM)
-  SPU GETLLAR polling detection: false
+  SPU Reservation Busy Waiting Percentage: 0
+  SPU GETLLAR Busy Waiting Percentage: 100
   SPU Debug: false
   MFC Debug: false
-  Preferred SPU Threads: 0
+  Preferred SPU Threads: 1
   SPU delay penalty: 3
   SPU loop detection: false
   Max SPURS Threads: 6
-  SPU Block Size: Safe
+  SPU Block Size: Mega
   Accurate GETLLAR: false
   Accurate SPU DMA: false
+  Accurate SPU Reservations: true
   Accurate Cache Line Stores: false
   Accurate RSX reservation access: false
+  RSX FIFO Accuracy: Fast
   SPU Verification: true
   SPU Cache: true
   SPU Profiler: false
@@ -53,6 +56,10 @@ Core:
   TSX Transaction First Limit: 800
   TSX Transaction Second Limit: 2000
   Clocks scale: 100
+  SPU Wake-Up Delay: 0
+  SPU Wake-Up Delay Thread Mask: 63
+  Max CPU Preempt Count: 0
+  Allow RSX CPU Preemptions: true
   Sleep Timers Accuracy: As Host
   Performance Report Threshold: 500
   Enable Performance Report: false
@@ -62,6 +69,7 @@ VFS:
   Initialize Directories: true
   Limit disk cache size: false
   Disk cache maximum size (MB): 5120
+  Empty /dev_hdd0/tmp/: true
 Video:
   Renderer: Vulkan
   Resolution: 1280x720
@@ -83,6 +91,7 @@ Video:
   Force High Precision Z buffer: false
   Strict Rendering Mode: false
   Disable ZCull Occlusion Queries: false
+  Disable Video Output: false
   Disable Vertex Cache: false
   Disable FIFO Reordering: false
   Enable Frame Skip: false
@@ -91,7 +100,7 @@ Video:
   Disable Vulkan Memory Allocator: false
   Use full RGB output range: true
   Strict Texture Flushing: false
-  Disable native float16 support: false
+  Disable native float16 support: true
   Multithreaded RSX: false
   Relaxed ZCULL Sync: false
   Enable 3D: false
@@ -120,7 +129,7 @@ Video:
     Asynchronous Texture Streaming 2: false
     Enable FidelityFX Super Resolution Upscaling: false
     FidelityFX CAS Sharpening Intensity: 50
-    Asynchronous Queue Scheduler: Safe
+    Asynchronous Queue Scheduler: Fast
   Performance Overlay:
     Enabled: false
     Enable Framerate Graph: false
@@ -159,7 +168,7 @@ Audio:
   Master Volume: 100
   Enable Buffering: true
   Desired Audio Buffer Duration: 100
-  Enable Time Stretching: false
+  Enable Time Stretching: true
   Time Stretching Threshold: 75
   Microphone Type: "Null"
   Microphone Devices: "@@@@@@@@@@@@"
@@ -189,15 +198,19 @@ Net:
   DNS address: 8.8.8.8
   IP swap list: ""
   PSN status: Disconnected
+Savestate:
+  Start Paused: false
+  Suspend Emulation Savestate Mode: true
+  Inspection Mode Savestates: false
+  Save Disc Game Data: false
 Miscellaneous:
   Automatically start games after boot: true
-  Exit RPCS3 when process finishes: false
-  Start games in fullscreen mode: false
+  Exit RPCS3 when process finishes: true
+  Start games in fullscreen mode: true
   Prevent display sleep while running games: true
   Show trophy popups: true
   Show shader compilation hint: true
   Use native user interface: true
   GDB Server: 127.0.0.1:2345
   Silence All Logs: false
-  Window Title Format: "FPS: %F | %R | %V | %T [%t]"
-Log: {}
\ No newline at end of file
+  Window Title Format: "FPS: %F | %R | %V | %T [%t]"
\ No newline at end of file
diff --git a/emu-configs/rpcs3/vfs.yml b/emu-configs/rpcs3/vfs.yml
new file mode 100644
index 00000000..f5b89a9f
--- /dev/null
+++ b/emu-configs/rpcs3/vfs.yml
@@ -0,0 +1,49 @@
+$(EmulatorDir): "/home/deck/retrodeck/roms/ps3/emudir"
+/dev_hdd0/: $(EmulatorDir)dev_hdd0/
+/dev_hdd1/: $(EmulatorDir)dev_hdd1/
+/dev_flash/: $(EmulatorDir)dev_flash/
+/dev_flash2/: $(EmulatorDir)dev_flash2/
+/dev_flash3/: $(EmulatorDir)dev_flash3/
+/dev_bdvd/: $(EmulatorDir)dev_bdvd/
+/app_home/: ""
+/dev_usb***/:
+  /dev_usb000:
+    Path: $(EmulatorDir)dev_usb000/
+    Serial: ""
+    VID: ""
+    PID: ""
+  /dev_usb001:
+    Path: ""
+    Serial: ""
+    VID: ""
+    PID: ""
+  /dev_usb002:
+    Path: ""
+    Serial: ""
+    VID: ""
+    PID: ""
+  /dev_usb003:
+    Path: ""
+    Serial: ""
+    VID: ""
+    PID: ""
+  /dev_usb004:
+    Path: ""
+    Serial: ""
+    VID: ""
+    PID: ""
+  /dev_usb005:
+    Path: ""
+    Serial: ""
+    VID: ""
+    PID: ""
+  /dev_usb006:
+    Path: ""
+    Serial: ""
+    VID: ""
+    PID: ""
+  /dev_usb007:
+    Path: ""
+    Serial: ""
+    VID: ""
+    PID: ""
\ No newline at end of file
diff --git a/retrodeck.sh b/retrodeck.sh
index ee2cec90..122ebcef 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -144,7 +144,8 @@ standalones_init() {
     echo "Initializing RPCS3"
     echo "------------------------"
     mkdir -pv /var/config/rpcs3/
-    cp -fvr $emuconfigs/config.yml /var/config/rpcs3/
+    cp -fvr $emuconfigs/rpcs3/* /var/config/rpcs3/
+    sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/rpcs3/vfs.yml
 
     # XEMU
     echo "------------------------"