diff --git a/functions/other_functions.sh b/functions/other_functions.sh
index 3d3939a7..69c95e55 100644
--- a/functions/other_functions.sh
+++ b/functions/other_functions.sh
@@ -973,3 +973,19 @@ convert_to_markdown() {
       -e 's|</description>||g' \
       -e '/<[^>]*>/d' > "$output_file" # Remove any other XML tags and output to .md file
 }
+
+# This function updates RetroArch by synchronizing shaders, cores, and border overlays.
+# It should be called whenever RetroArch is reset or updated.
+retroarch_updater(){
+
+  log i "Running RetroArch updater"
+
+  # Copy shaders from the application share directory to the RetroArch configuration directory
+  cp -rf /app/share/libretro/shaders /var/config/retroarch/ && log d "RetroArch shaders updated correctly"
+  
+  # Synchronize cores from the application share directory to the RetroArch cores directory
+  rsync -rlD --mkpath "/app/share/libretro/cores/" "/var/config/retroarch/cores/" && log d "RetroArch cores updated correctly"
+  
+  # Synchronize border overlays from the RetroDeck configuration directory to the RetroArch overlays directory
+  rsync -rlD --mkpath "/app/retrodeck/config/retroarch/borders/" "/var/config/retroarch/overlays/borders/" && log d "RetroArch overlays and borders updated correctly"
+}
diff --git a/functions/post_update.sh b/functions/post_update.sh
index 47eb3de4..c50fae4d 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -570,6 +570,7 @@ post_update() {
     install_retrodeck_controller_profile
   fi
 
+  retroarch_updater
   update_splashscreens
   deploy_helper_files
   build_retrodeck_current_presets
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 3d05b4fc..792065c1 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -124,15 +124,12 @@ prepare_component() {
         dir_prep "$bios_folder" "/var/config/retroarch/system"
         dir_prep "$rdhome/logs/retroarch" "/var/config/retroarch/logs"
         create_dir /var/config/retroarch/shaders/
-        cp -rf /app/share/libretro/shaders /var/config/retroarch/
         dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders"
-        rsync -rlD --mkpath "/app/share/libretro/cores/" "/var/config/retroarch/cores/"
         cp -fv $config/retroarch/retroarch.cfg /var/config/retroarch/
         cp -fv $config/retroarch/retroarch-core-options.cfg /var/config/retroarch/
         rsync -rlD --mkpath "$config/retroarch/core-overrides/" "/var/config/retroarch/config/"
         rsync -rlD --mkpath "$config/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/"
         dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders"
-        rsync -rlD --mkpath "/app/retrodeck/config/retroarch/borders/" "/var/config/retroarch/overlays/borders/"
         set_setting_value "$raconf" "savefile_directory" "$saves_folder" "retroarch"
         set_setting_value "$raconf" "savestate_directory" "$states_folder" "retroarch"
         set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch"
@@ -146,6 +143,8 @@ prepare_component() {
       create_dir "$bios_folder/Mupen64plus"
       create_dir "$bios_folder/quasi88"
 
+      retroarch_updater
+
       # FBNEO
       log i "--------------------------------"
       log i "Prepearing FBNEO_LIBRETRO"
diff --git a/net.retrodeck.retrodeck.metainfo.xml b/net.retrodeck.retrodeck.metainfo.xml
index 5790e5aa..88777fe6 100644
--- a/net.retrodeck.retrodeck.metainfo.xml
+++ b/net.retrodeck.retrodeck.metainfo.xml
@@ -63,7 +63,10 @@
          <release version="0.9.1b" date="2025-02-03">
             <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.9.0b</url>
             <description>
-               <p>Welcome to RetroDECK cooker-0.9.1b</p>
+               <p>Bug fixes:</p>
+               <ul>
+                  <li>RETROARCH: Fixed a bug where the cores were not updated along with RetroArch itself</li>
+               </ul>
             </description>
          </release>
          <release version="0.9.0b" date="2025-02-04">