diff --git a/functions/post_update.sh b/functions/post_update.sh
index 4ee739e6..30d8b76b 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -270,7 +270,11 @@ post_update() {
     mv -v "$saves_folder/ps3/rpcs3.bak" "$rdhome/backups/saves/ps3/rpcs3"
     log i "RPCS3 saves migration completed, a backup was made here: \"$rdhome/backups/saves/ps3/rpcs3\"."
     source /app/libexec/functions.sh
-    dir_prep "$saves_folder/ps3/rpcs3" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"    
+    dir_prep "$saves_folder/ps3/rpcs3" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"
+
+    log i "Switch firmware folder should be moved in \"$bios_folder/switch/firmware\" from \"$bios_folder/switch/registered\""
+    dir_prep "$bios_folder/switch/firmware" "$bios_folder/switch/registered"
+
   fi
 
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 86d1de44..9849d3f9 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -557,7 +557,7 @@ prepare_component() {
         rm -rf /var/config/Ryujinx/bis
         dir_prep "$saves_folder/switch/ryujinx/nand" "/var/config/Ryujinx/bis"
         dir_prep "$saves_folder/switch/ryujinx/sdcard" "/var/config/Ryujinx/sdcard"
-        dir_prep "$bios_folder/switch/ryujinx/registered" "/var/config/Ryujinx/bis/system/Contents/registered"
+        dir_prep "$bios_folder/switch/firmware" "/var/config/Ryujinx/bis/system/Contents/registered"
       fi
     fi
     # if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves
@@ -638,7 +638,7 @@ prepare_component() {
       dir_prep "$saves_folder/switch/yuzu/nand" "/var/data/yuzu/nand"
       dir_prep "$saves_folder/switch/yuzu/sdmc" "/var/data/yuzu/sdmc"
       dir_prep "$bios_folder/switch/keys" "/var/data/yuzu/keys"
-      dir_prep "$bios_folder/switch/registered" "/var/data/yuzu/nand/system/Contents/registered"
+      dir_prep "$bios_folder/switch/firmware" "/var/data/yuzu/nand/system/Contents/registered"
       dir_prep "$logs_folder/yuzu" "/var/data/yuzu/log"
       dir_prep "$screenshots_folder" "/var/data/yuzu/screenshots"
       dir_prep "$mods_folder/Yuzu" "/var/data/yuzu/load"
@@ -654,7 +654,7 @@ prepare_component() {
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
       dir_prep "$bios_folder/switch/keys" "/var/data/yuzu/keys"
-      dir_prep "$bios_folder/switch/registered" "/var/data/yuzu/nand/system/Contents/registered"
+      dir_prep "$bios_folder/switch/firmware" "/var/data/yuzu/nand/system/Contents/registered"
       dir_prep "$saves_folder/switch/yuzu/nand" "/var/data/yuzu/nand"
       dir_prep "$saves_folder/switch/yuzu/sdmc" "/var/data/yuzu/sdmc"
       dir_prep "$logs_folder/yuzu" "/var/data/yuzu/log"