diff --git a/functions/global.sh b/functions/global.sh
index 8b8eb4f8..4ef373e8 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -112,6 +112,11 @@ rpcs3vfsconf="/var/config/rpcs3/vfs.yml"
 vita3kconf="/var/data/Vita3K/config.yml"
 vita3kusrconfdir="$bios_folder/Vita3K/Vita3K"
 
+# MAME-SA config files
+
+mameconf="/var/config/mame/mame.ini"
+mameuiconf="$bios_folder/Vita3K/ui.ini"
+
 # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions
 if [[ -f "$HOME/retrodeck/.lock" ]]; then
   mv "$HOME/retrodeck/.lock" $lockfile
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index e37750cb..04f48a9c 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -761,15 +761,12 @@ prepare_component() {
     cp -fvr "$emuconfigs/mame/ui.ini" "/var/config/mame/cfg"
     cp -fvr "$emuconfigs/mame/default.cfg" "/var/config/mame/cfg"
 
-    sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/cfg/mame.ini"
-    sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "/var/config/mame/cfg/mame.ini"
-    sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/mame/cfg/mame.ini"
-    sed -i 's#RETRODECKSTATESDIR#'$states_folder'#g' "/var/config/mame/cfg/mame.ini"
+    sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "$mameconf" # one-off as roms folders are a lot
+    set_setting_value "$mameconf" "nvram_directory" "$saves_folder/mame-sa/nvram" "mame"
+    set_setting_value "$mameconf" "state_directory" "$states_folder/mame-sa" "mame"
+    set_setting_value "$mameconf" "snapshot_directory" "$screenshots_folder/mame-sa" "mame"
+    set_setting_value "$mameconf" "diff_directory" "$saves_folder/mame-sa/diff" "mame"
 
-    sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/cfg/ui.ini"
-    sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "/var/config/mame/cfg/ui.ini"
-    sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/mame/cfg/ui.ini"
-    sed -i 's#RETRODECKSTATESDIR#'$states_folder'#g' "/var/config/mame/cfg/ui.ini"
   fi
 
   if [[ "$component" =~ ^(gzdoom|GZDOOM|all)$ ]]; then