diff --git a/BUILDING.md b/BUILDING.md
index d1cf610a0..4030d301b 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -173,19 +173,28 @@ JELOS supports various build variables which alter the behavior of the distribut
 > Note: <sup>1</sup> this property will change to yes/no for consistency in a future release.
 
 ### Special env variables
-For development build, you can use the following env variables to customize the image. Some of them can be included in your `.bashrc` startup shell script.
+For development build, you can use the following env variables to customize the image or change build time functionality. They can be included in your `.bashrc` startup shell script.
+|Variable|Function|
+|----|----|
+|LOCAL_SSH_KEYS_FILE|Enables using ssh public keys for access without the root password.|
+|LOCAL_WIFI_SSID|The SSID of the network the device should connect too automatically.|
+|LOCAL_WIFI_KEY|The WIFI authentication key for the connection."|
+|SCREENSCRAPER_DEV_LOGIN|Login information for screenscraper.fr.|
+|GAMESDB_APIKEY|Login information for thegamesdb.net.|
+|CHEEVOS_DEV_LOGIN|Login information for retroachievements.org.|
+|CLEAN_PACKAGES|Allows specifying packages to clean during a build.|
 
-**SSH keys**
+#### SSH keys
 ```
 export LOCAL_SSH_KEYS_FILE=~/.ssh/jelos/authorized_keys
 ```
-**WiFi SSID and password**
+#### WiFi SSID and password
 ```
 export LOCAL_WIFI_SSID=MYWIFI
 export LOCAL_WIFI_KEY=secret
 ```
 
-**Screenscraper, GamesDB, and RetroAchievements**
+#### Screenscraper, GamesDB, and RetroAchievements
 
 To enable Screenscraper, GamesDB, and RetroAchievements, register at each site and apply the api keys in ~/developer_settings.conf or add them as environment variables. Unsetting one of the variables will disable it in EmulationStation. This configuration is picked up by EmulationStation during the build.
 
@@ -198,6 +207,11 @@ export GAMESDB_APIKEY="APIKEY"
 export CHEEVOS_DEV_LOGIN="z=RETROACHIEVEMENTSUSERNAME&y=APIKEYID"
 ```
 
+#### Cleaning additional packages
+```
+CLEAN_PACKAGES="linux ppsspp-sa" make AMD64
+```
+
 ### Creating a patch for a package
 It is common to have imported package source code modifed to fit the use case. It's recommended to use a special shell script to built it in case you need to iterate over it. See below.
 
diff --git a/distributions/JELOS/options b/distributions/JELOS/options
index 6b4a917d1..7ab2ab714 100644
--- a/distributions/JELOS/options
+++ b/distributions/JELOS/options
@@ -50,7 +50,7 @@
 # a BSP kernel and a rotated display when using DEVICE_ROOT.
   if [ -n "${DEVICE_ROOT}" ]
   then
-    CLEAN_DEVICE_ROOT="linux u-boot SDL2 retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa"
+    CLEAN_DEVICE_ROOT="linux u-boot u-boot-script SDL2 retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa"
   fi
 
 # additional drivers to install:
diff --git a/packages/compat/box64/package.mk b/packages/compat/box64/package.mk
index b0a5958de..60b2d6a91 100644
--- a/packages/compat/box64/package.mk
+++ b/packages/compat/box64/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="box64"
-PKG_VERSION="4110956ddaf3c58a1e8e50aa7adba2ed43e3a6b7"
+PKG_VERSION="9698844cc3894f29e101fe9282141d4a5e27267f"
 PKG_ARCH="aarch64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/ptitSeb/box64"
diff --git a/packages/emulators/libretro/beetle-pce-fast-lr/package.mk b/packages/emulators/libretro/beetle-pce-fast-lr/package.mk
index 02dfeb7e7..af6f7bf59 100644
--- a/packages/emulators/libretro/beetle-pce-fast-lr/package.mk
+++ b/packages/emulators/libretro/beetle-pce-fast-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-fast-lr"
-PKG_VERSION="daecc614f6cdbfa1cd754c39f31c4b3f2c658f98"
+PKG_VERSION="c7d3c17ce7aafc71ff58914d2dd0a5be30df11d1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/emulators/libretro/beetle-pce-lr/package.mk b/packages/emulators/libretro/beetle-pce-lr/package.mk
index 8f0d5ea34..7db010eaa 100644
--- a/packages/emulators/libretro/beetle-pce-lr/package.mk
+++ b/packages/emulators/libretro/beetle-pce-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-lr"
-PKG_VERSION="df307b982c39efc5cc611bae5eb4849e1700d36e"
+PKG_VERSION="ea636e724d2217339e32d23a4b8eabed9e3503a6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/emulators/libretro/beetle-supergrafx-lr/package.mk b/packages/emulators/libretro/beetle-supergrafx-lr/package.mk
index 58a67cc1e..f0351a48c 100644
--- a/packages/emulators/libretro/beetle-supergrafx-lr/package.mk
+++ b/packages/emulators/libretro/beetle-supergrafx-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-supergrafx-lr"
-PKG_VERSION="9cd2f13c3f44a708f95c3243ca86d2ba5f39aaae"
+PKG_VERSION="50b80ade59371c2e610ae244bc81d0bf51674a16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/emulators/libretro/bsnes-lr/package.mk b/packages/emulators/libretro/bsnes-lr/package.mk
index 58fdb7a09..c1c6f4597 100644
--- a/packages/emulators/libretro/bsnes-lr/package.mk
+++ b/packages/emulators/libretro/bsnes-lr/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="bsnes-lr"
-PKG_VERSION="3c1868250b90f5961eccd044a780489c29e4c40f"
+PKG_VERSION="4f4e22e83a92e2e3999e5792f52085e1ecd662e2"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-libretro"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/emulators/libretro/dosbox-pure-lr/package.mk b/packages/emulators/libretro/dosbox-pure-lr/package.mk
index bf494c434..c9062a24d 100644
--- a/packages/emulators/libretro/dosbox-pure-lr/package.mk
+++ b/packages/emulators/libretro/dosbox-pure-lr/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox-pure-lr"
-PKG_VERSION="490d59bdd06e40ce5bd3a16259af6e8d62c60e70"
+PKG_VERSION="1be1646b2fa173b5d960be1b1d8cb2dbaf305f51"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/emulators/libretro/fake08-lr/package.mk b/packages/emulators/libretro/fake08-lr/package.mk
index 3fa10a3f0..cb88dfe3f 100644
--- a/packages/emulators/libretro/fake08-lr/package.mk
+++ b/packages/emulators/libretro/fake08-lr/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Lakka (https://www.lakka.tv)
 
 PKG_NAME="fake08-lr"
-PKG_VERSION="eed6109d121e4de8ad1a2d6f81d712648462592f"
+PKG_VERSION="14243c0e18425acbe557a81eb9c230dd44e85982"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/jtothebell/fake-08"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/emulators/libretro/fbneo-lr/package.mk b/packages/emulators/libretro/fbneo-lr/package.mk
index d5a21484a..81d82fce8 100644
--- a/packages/emulators/libretro/fbneo-lr/package.mk
+++ b/packages/emulators/libretro/fbneo-lr/package.mk
@@ -4,7 +4,7 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="fbneo-lr"
-PKG_VERSION="ba56e6e74558b00391628a6988c4d4e4c88858ce"
+PKG_VERSION="b5608e891ad1879a067412fb82f25e6f446a1f98"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/emulators/libretro/genesis-plus-gx-lr/package.mk b/packages/emulators/libretro/genesis-plus-gx-lr/package.mk
index 4c1fbae5e..59ed1706e 100644
--- a/packages/emulators/libretro/genesis-plus-gx-lr/package.mk
+++ b/packages/emulators/libretro/genesis-plus-gx-lr/package.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-lr"
-PKG_VERSION="e50eaa6d698b401f381c46f90b922cc6b1ae1970"
+PKG_VERSION="b024aa0de43556b5bd7e30230a177f2d7fc8cc28"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk b/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk
index c271b88f5..73a27bd8b 100644
--- a/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk
+++ b/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-wide-lr"
-PKG_VERSION="08bc39b8bb1fb8b3c541c4b99119458c6294df11"
+PKG_VERSION="5e79dce6ed60b0d749fb2164b360850198edfe89"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/emulators/libretro/libretro-database/package.mk b/packages/emulators/libretro/libretro-database/package.mk
index 3eb0a426a..91a4b36bf 100644
--- a/packages/emulators/libretro/libretro-database/package.mk
+++ b/packages/emulators/libretro/libretro-database/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="libretro-database"
-PKG_VERSION="90a33aa566022437ae08b139efa5ef9a1eb6eb91"
+PKG_VERSION="a80e58a1e99298a295c4e94add869ea54b3f8ec0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/emulators/libretro/mame2003-plus-lr/package.mk b/packages/emulators/libretro/mame2003-plus-lr/package.mk
index 320925f26..ccb383f64 100644
--- a/packages/emulators/libretro/mame2003-plus-lr/package.mk
+++ b/packages/emulators/libretro/mame2003-plus-lr/package.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="mame2003-plus-lr"
-PKG_VERSION="56be1182df7333513538dcb7cf6a0cac15d732f3"
+PKG_VERSION="2ec0caa3bb1bd4b995414e050a575f78d3f6725c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
diff --git a/packages/emulators/libretro/ppsspp-lr/package.mk b/packages/emulators/libretro/ppsspp-lr/package.mk
index 04b82b464..869e9d692 100644
--- a/packages/emulators/libretro/ppsspp-lr/package.mk
+++ b/packages/emulators/libretro/ppsspp-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="ppsspp-lr"
-PKG_VERSION="5ae9c9c64e5605881a3e3f5bc43ec39271dc9b2f"
+PKG_VERSION="264c6d740b86b1b445e0a9b6505a9884449b99f1"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
@@ -28,65 +28,68 @@ PKG_DEPENDS_TARGET="toolchain SDL2 ffmpeg libzip zstd"
 PKG_LONGDESC="A PSP emulator for Android, Windows, Mac, Linux and Blackberry 10, written in C++."
 GET_HANDLER_SUPPORT="git"
 
-PKG_LIBNAME="ppsspp_libretro.so"
-PKG_LIBPATH="lib/${PKG_LIBNAME}"
+
+pre_configure_target() {
+  PKG_LIBNAME="ppsspp_libretro.so"
+  PKG_LIBPATH="lib/${PKG_LIBNAME}"
 
 
-if [ ! "${OPENGL}" = "no" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew glslang"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=OFF \
-                           -DUSING_GLES2=OFF"
-fi
+  if [ ! "${OPENGL}" = "no" ]; then
+    PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew glslang"
+    PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=OFF \
+                             -DUSING_GLES2=OFF"
+  fi
 
-if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=ON \
-                           -DUSING_EGL=OFF \
-                           -DUSING_GLES2=ON \
-                           -DVULKAN=OFF \
-                           -DUSE_VULKAN_DISPLAY_KHR=OFF\
-                           -DUSING_X11_VULKAN=OFF"
-fi
+  if [ "${OPENGLES_SUPPORT}" = yes ]; then
+    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+    PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=ON \
+                             -DUSING_EGL=OFF \
+                             -DUSING_GLES2=ON \
+                             -DVULKAN=OFF \
+                             -DUSE_VULKAN_DISPLAY_KHR=OFF\
+                             -DUSING_X11_VULKAN=OFF"
+  fi
 
-if [ "${VULKAN_SUPPORT}" = "yes" ]
-then
-  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
-                           -DVULKAN=ON \
-                           -DEGL_NO_X11=1
-                           -DMESA_EGL_NO_X11_HEADERS=1"
-else
-  PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF"
-fi
+  if [ "${VULKAN_SUPPORT}" = "yes" ]
+  then
+    PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
+    PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
+                             -DVULKAN=ON \
+                             -DEGL_NO_X11=1
+                             -DMESA_EGL_NO_X11_HEADERS=1"
+  else
+    PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF"
+  fi
 
-if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=ON"
-else
-  PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=OFF"
-fi
+  if [ "${DISPLAYSERVER}" = "wl" ]; then
+    PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
+    PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=ON"
+  else
+    PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=OFF"
+  fi
 
-case ${TARGET_ARCH} in
-  aarch64)
-  PKG_CMAKE_OPTS_TARGET+=" -DFORCED_CPU=aarch64"
-  ;;
-esac
+  case ${TARGET_ARCH} in
+    aarch64)
+      PKG_CMAKE_OPTS_TARGET+=" -DFORCED_CPU=aarch64"
+    ;;
+  esac
 
-PKG_CMAKE_OPTS_TARGET+="${PKG_CMAKE_OPTS_TARGET} \
-                        -DUSE_SYSTEM_FFMPEG=OFF \
-                        -DCMAKE_BUILD_TYPE=Release \
-                        -DCMAKE_SYSTEM_NAME=Linux \
-                        -DBUILD_SHARED_LIBS=OFF \
-                        -DANDROID=OFF \
-                        -DWIN32=OFF \
-                        -DAPPLE=OFF \
-			-DLIBRETRO=ON \
-                        -DCMAKE_CROSSCOMPILING=ON \
-                        -DUSING_QT_UI=OFF \
-                        -DUNITTEST=OFF \
-                        -DSIMULATOR=OFF \
-                        -DHEADLESS=OFF \
-                        -DUSE_DISCORD=OFF"
+  PKG_CMAKE_OPTS_TARGET+="${PKG_CMAKE_OPTS_TARGET} \
+                          -DUSE_SYSTEM_FFMPEG=OFF \
+                          -DCMAKE_BUILD_TYPE=Release \
+                          -DCMAKE_SYSTEM_NAME=Linux \
+                          -DBUILD_SHARED_LIBS=OFF \
+                          -DANDROID=OFF \
+                          -DWIN32=OFF \
+                          -DAPPLE=OFF \
+                          -DLIBRETRO=ON \
+                          -DCMAKE_CROSSCOMPILING=ON \
+                          -DUSING_QT_UI=OFF \
+                          -DUNITTEST=OFF \
+                          -DSIMULATOR=OFF \
+                          -DHEADLESS=OFF \
+                          -DUSE_DISCORD=OFF"
+}
 
 pre_make_target() {
   # fix cross compiling
diff --git a/packages/emulators/libretro/puae-lr/package.mk b/packages/emulators/libretro/puae-lr/package.mk
index ad3a45bc7..3e12d0524 100644
--- a/packages/emulators/libretro/puae-lr/package.mk
+++ b/packages/emulators/libretro/puae-lr/package.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="puae-lr"
-PKG_VERSION="605264f15d31c42b1fe546fd47a6ffb1301c03c8"
+PKG_VERSION="e7a4debc10aa9fa0c649940882eb4979c1819ab1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/emulators/libretro/slang-shaders/package.mk b/packages/emulators/libretro/slang-shaders/package.mk
index 5c8b1f57f..624d1c9a3 100644
--- a/packages/emulators/libretro/slang-shaders/package.mk
+++ b/packages/emulators/libretro/slang-shaders/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="slang-shaders"
-PKG_VERSION="9a632e837030503fee15007980455834866a4812"
+PKG_VERSION="b9d3443a2736cf6db8408c49877ffc299e756511"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/emulators/libretro/stella-lr/package.mk b/packages/emulators/libretro/stella-lr/package.mk
index fcb82e76b..de99f6004 100644
--- a/packages/emulators/libretro/stella-lr/package.mk
+++ b/packages/emulators/libretro/stella-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="stella-lr"
-PKG_VERSION="ee13c16930e2f43bf68dd86425356d4081c81eb0"
+PKG_VERSION="d5eeba505c97142fa93f82a16db2f0b27f511e3c"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"
diff --git a/packages/emulators/standalone/hypseus-singe/package.mk b/packages/emulators/standalone/hypseus-singe/package.mk
index 74a5c6ebc..8f9a3cbbe 100644
--- a/packages/emulators/standalone/hypseus-singe/package.mk
+++ b/packages/emulators/standalone/hypseus-singe/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="hypseus-singe"
-PKG_VERSION="a11c2b48f7ef0644ab1731d22325bf3b764f06db"
+PKG_VERSION="cd259aae9862361c0384dc0c29ef6a8982d517a5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL3"
diff --git a/packages/emulators/standalone/pico-8/package.mk b/packages/emulators/standalone/pico-8/package.mk
index d70459a92..0f2a20238 100644
--- a/packages/emulators/standalone/pico-8/package.mk
+++ b/packages/emulators/standalone/pico-8/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="pico-8"
-PKG_VERSION="7a4cddfdfc2fbbe631b53c8e4c418186fadc939f"
+PKG_VERSION="3614c2772e923898d8bf2225d108584ac2e5cfca"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE=""
diff --git a/packages/emulators/standalone/ppsspp-sa/package.mk b/packages/emulators/standalone/ppsspp-sa/package.mk
index 171a7ff08..79578a801 100644
--- a/packages/emulators/standalone/ppsspp-sa/package.mk
+++ b/packages/emulators/standalone/ppsspp-sa/package.mk
@@ -7,7 +7,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="${PKG_SITE}.git"
-PKG_VERSION="5ae9c9c64e5605881a3e3f5bc43ec39271dc9b2f"
+PKG_VERSION="264c6d740b86b1b445e0a9b6505a9884449b99f1"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
 PKG_SHORTDESC="PPSSPPDL"
diff --git a/packages/emulators/standalone/retroarch/package.mk b/packages/emulators/standalone/retroarch/package.mk
index 6b7ddcb87..ac46589e3 100644
--- a/packages/emulators/standalone/retroarch/package.mk
+++ b/packages/emulators/standalone/retroarch/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="retroarch"
-PKG_VERSION="6b9727911b5d71ff276e9dddafc9f065b8550090"
+PKG_VERSION="5caebf367555cb58dd4a658d0ac4123335bb6b71"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"
diff --git a/packages/emulators/tools/retroarch-assets/package.mk b/packages/emulators/tools/retroarch-assets/package.mk
index 973e23d8b..dafed73ed 100644
--- a/packages/emulators/tools/retroarch-assets/package.mk
+++ b/packages/emulators/tools/retroarch-assets/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-assets"
-PKG_VERSION="7f80735ae776fa99b3e06df3d810d6dc016d9e15"
+PKG_VERSION="5049db390a2247ca441210dd33a253bac087dd5a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/retroarch-assets"
 PKG_URL="https://github.com/libretro/retroarch-assets/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/emulators/tools/retroarch-joypads/package.mk b/packages/emulators/tools/retroarch-joypads/package.mk
index 5ec48e7a0..1cfca4fac 100644
--- a/packages/emulators/tools/retroarch-joypads/package.mk
+++ b/packages/emulators/tools/retroarch-joypads/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="retroarch-joypads"
-PKG_VERSION="03b51f6c33aab6fcc371ad2b06efc559c27c82d1"
+PKG_VERSION="ce8c5441884fffa1872a7de218157f23e15591e9"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/retroarch-joypad-autoconfig"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/tools/u-boot-script/package.mk b/packages/tools/u-boot-script/package.mk
index 8aaa6d0ac..f1d986306 100644
--- a/packages/tools/u-boot-script/package.mk
+++ b/packages/tools/u-boot-script/package.mk
@@ -13,7 +13,7 @@ PKG_NEED_UNPACK="${PROJECT_DIR}/${PROJECT}/bootloader"
 
 make_target() {
   if find_dir_path bootloader/scripts ; then
-    for src in $FOUND_PATH/*.src ; do
+    for src in ${FOUND_PATH}/*.src ; do
       mkimage -A ${TARGET_KERNEL_ARCH} -O linux -T script -C none -d "$src" "$(basename $src .src)"
     done
   fi
diff --git a/projects/PC/devices/AMD64/linux/linux.x86_64.conf b/projects/PC/devices/AMD64/linux/linux.x86_64.conf
index ed1d1783d..2ac4693f8 100644
--- a/projects/PC/devices/AMD64/linux/linux.x86_64.conf
+++ b/projects/PC/devices/AMD64/linux/linux.x86_64.conf
@@ -124,8 +124,6 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
 CONFIG_PREEMPT_DYNAMIC=y
-CONFIG_PREEMPT_RT=y
-CONFIG_HAVE_PREEMPT_LAZY=y
 
 # CONFIG_SCHED_CORE is not set
 
diff --git a/scripts/build_distro b/scripts/build_distro
index f3dfe6d3c..18eaa82df 100755
--- a/scripts/build_distro
+++ b/scripts/build_distro
@@ -60,7 +60,7 @@ then
 fi
 
 # Clean necessary packages.
-PKG_CLEAN+=" ${CLEAN_NETWORK} ${CLEAN_OS_BASE} ${CLEAN_DEVICE_ROOT}"
+PKG_CLEAN+=" ${CLEAN_NETWORK} ${CLEAN_OS_BASE} ${CLEAN_DEVICE_ROOT} ${CLEAN_PACKAGES}"
 
 if [ ! -n "${DIRTY}" ]
 then