diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index fe7b623b..d2f675ef 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -988,6 +988,10 @@ modules:
         # Desktop entry
         - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop
 
+        # Setup pcsx2
+        - mkdir -p /var/config/PCSX2/inis/
+        - cp PCSX2_ui.ini /var/config/PCSX2/inis/PCSX2_ui.ini
+
     #cleanup: ['*']
     sources:
       - type: file
@@ -998,8 +1002,8 @@ modules:
         path: es_systems.xml
       - type: file
         path: retrodeck.sh
-      - type: file
-        path: retrodeck-retroarch.cfg
+      - type: dir
+        path: emu-configs
       - type: file
         path: tools-gamelist.xml
       - type: dir
diff --git a/emu-configs/PCSX2_ui.ini b/emu-configs/PCSX2_ui.ini
new file mode 100644
index 00000000..bfbd0f6c
--- /dev/null
+++ b/emu-configs/PCSX2_ui.ini
@@ -0,0 +1,159 @@
+MainGuiPosition=169,145
+SysSettingsTabName=Cpu
+McdSettingsTabName=none
+ComponentsTabName=
+AppSettingsTabName=none
+GameDatabaseTabName=none
+LanguageId=59
+LanguageCode=en_US
+RecentIsoCount=20
+GzipIsoIndexTemplate=$(f).pindex.tmp
+Listbook_ImageSize=32
+Toolbar_ImageSize=24
+Toolbar_ShowLabels=enabled
+CurrentIso=
+CurrentBlockdump=
+CurrentELF=
+CurrentIRX=
+EnableSpeedHacks=enabled
+EnableGameFixes=disabled
+EnableFastBoot=enabled
+EnablePresets=enabled
+PresetIndex=1
+AskOnBoot=disabled
+DevMode=disabled
+CdvdSource=ISO
+[ProgramLog]
+Visible=disabled
+AutoDock=enabled
+DisplayPosition=265,103
+DisplaySize=680,560
+FontSize=8
+Theme=Default
+[Folders]
+UseDefaultBios=disabled
+UseDefaultSnapshots=enabled
+UseDefaultSavestates=enabled
+UseDefaultMemoryCards=enabled
+UseDefaultLogs=enabled
+UseDefaultLangs=enabled
+UseDefaultCheats=enabled
+UseDefaultCheatsWS=enabled
+UseDefaultTextures=enabled
+Bios=~/retrodeck/bios
+Snapshots=~/retrodeck/screenshots
+Savestates=~/retrodeck/states/
+MemoryCards=~/retrodeck/saves/
+Logs=/var/config/PCSX2/logs
+Langs=/app/share/PCSX2/resources/locale
+Cheats=/var/config/PCSX2/cheats
+CheatsWS=/var/config/PCSX2/cheats_ws
+Cache=/var/config/PCSX2/cache
+Textures=
+RunIso=/var/config/PCSX2
+RunELF=/var/config/PCSX2
+RunDisc=
+[GSWindow]
+CloseOnEsc=enabled
+DefaultToFullscreen=disabled
+AlwaysHideMouse=disabled
+DisableResizeBorders=disabled
+DisableScreenSaver=enabled
+WindowSize=640,480
+WindowPos=-1,-1
+IsMaximized=disabled
+IsFullscreen=disabled
+EnableVsyncWindowFlag=disabled
+IsToggleFullscreenOnDoubleClick=enabled
+AspectRatio=4:3
+FMVAspectRatioSwitch=Off
+Zoom=100
+[InputRecording]
+VirtualPadPosition=-1,-1
+m_frame_advance_amount=1
+[Capture]
+EnableAudio=enabled
+[UiTemplates]
+LimiterUnlimited=Max
+LimiterTurbo=Turbo
+LimiterSlowmo=Slowmo
+LimiterNormal=Normal
+OutputFrame=Frame
+OutputField=Field
+OutputProgressive=Progressive
+OutputInterlaced=Interlaced
+Paused=<PAUSED> 
+TitleTemplate=Slot: ${slot} | Speed: ${speed} (${vfps}) | ${videomode} | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage}
+RecordingTemplate=Slot: ${slot} | Frame: ${frame}/${maxFrame} | Rec. Mode: ${mode} | Speed: ${speed} (${vfps}) | Limiter: ${limiter}
+[MemoryCards]
+Slot1_Enable=enabled
+Slot1_Filename=Mcd001.ps2
+Slot2_Enable=enabled
+Slot2_Filename=Mcd002.ps2
+Multitap1_Slot2_Enable=disabled
+Multitap1_Slot2_Filename=Mcd-Multitap1-Slot02.ps2
+Multitap1_Slot3_Enable=disabled
+Multitap1_Slot3_Filename=Mcd-Multitap1-Slot03.ps2
+Multitap1_Slot4_Enable=disabled
+Multitap1_Slot4_Filename=Mcd-Multitap1-Slot04.ps2
+Multitap2_Slot2_Enable=disabled
+Multitap2_Slot2_Filename=Mcd-Multitap2-Slot02.ps2
+Multitap2_Slot3_Enable=disabled
+Multitap2_Slot3_Filename=Mcd-Multitap2-Slot03.ps2
+Multitap2_Slot4_Enable=disabled
+Multitap2_Slot4_Filename=Mcd-Multitap2-Slot04.ps2
+[Filenames]
+BIOS=scph10000.bin
+[Framerate]
+NominalScalar=1
+TurboScalar=2
+SlomoScalar=0.5
+SkipOnLimit=disabled
+SkipOnTurbo=disabled
+[ConsoleLogSources]
+Devel=disabled
+.EEout=enabled
+.IOPout=enabled
+.EErecPerf=disabled
+.ELF=disabled
+.SysEvents=disabled
+.p\&xThread=disabled
+.SYSout=disabled
+.PGIFout=disabled
+.Input\ Recording=disabled
+.Controller\ Info=disabled
+[TraceLogSources]
+.SIF=disabled
+EE.Bios=disabled
+EE.Memory=disabled
+EE.Disasm.R5900=disabled
+EE.Disasm.COP0=disabled
+EE.Disasm.FPU=disabled
+EE.Disasm.VUmacro=disabled
+EE.Disasm.Cache=disabled
+EE.Registers.HwRegs=disabled
+EE.Registers.UnknownRegs=disabled
+EE.Registers.DmaRegs=disabled
+EE.Registers.IPU=disabled
+EE.GIFtags=disabled
+EE.VIFcodes=disabled
+EE.MSKPATH3=disabled
+EE.Events.DmaCtrl=disabled
+EE.Events.Counters=disabled
+EE.Events.MFIFO=disabled
+EE.Events.VIF=disabled
+EE.Events.GIF=disabled
+IOP.Bios=disabled
+IOP.Memorycards=disabled
+IOP.Pad=disabled
+IOP.Disasm.R3000A=disabled
+IOP.Disasm.Memory=disabled
+IOP.Registers.HwRegs=disabled
+IOP.Registers.UnknownRegs=disabled
+IOP.Registers.DmaRegs=disabled
+IOP.Events.DmaCrl=disabled
+IOP.Events.Counters=disabled
+IOP.Events.CDVD=disabled
+IOP.Events.MDEC=disabled
+[TraceLogSources/IOP.Disasm.COP2]
+GPU=disabled
diff --git a/retrodeck-retroarch.cfg b/emu-configs/retrodeck-retroarch.cfg
similarity index 100%
rename from retrodeck-retroarch.cfg
rename to emu-configs/retrodeck-retroarch.cfg