diff --git a/functions/post_update.sh b/functions/post_update.sh
index 4102d559..82496a43 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -239,8 +239,7 @@ post_update() {
   fi
 
   if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed
-    cp -f "$emuconfigs/defaults/retrodeck/controller_configs/*.vdf" "$HOME/.steam/steam/controller_base/templates"
-    rsync -rlD --mkpath "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
+    install_retrodeck_controller_profile
   fi
 
   update_splashscreens
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 9dc43930..0b1cfb79 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 9dc439300e92338d5b2bc3fc680eedd4fe1d3b0c
+Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index 76809270..a2441b96 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit 76809270588f87c6c14df96fef2dde9a7bac84f4
+Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42