diff --git a/bin/build-esp32.sh b/bin/build-esp32.sh
index 7555e0006..4e799b30a 100755
--- a/bin/build-esp32.sh
+++ b/bin/build-esp32.sh
@@ -33,9 +33,9 @@ echo "Copying ESP32 update bin file"
 cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
 
 echo "Copying Filesystem for ESP32 targets"
-cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin || true
+cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
 cp bin/device-install.* $OUTDIR/
 cp bin/device-update.* $OUTDIR/
 
 echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json || true
+cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py
index 17a291d54..b75c66624 100644
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -301,8 +301,7 @@ if not should_skip_manifest and platform.name == "espressif32":
     target_lfs = env.DataToBin(
         join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR"
     )
-    # prepend the littlefs target to the mtjson dependencies
-    # mtjson_deps.insert(0, target_lfs)
+    mtjson_deps.append(target_lfs)
 
 if should_skip_manifest:
     def skip_manifest(source, target, env):
diff --git a/variants/esp32/esp32-common.ini b/variants/esp32/esp32-common.ini
index fe62df46a..ccdba0aed 100644
--- a/variants/esp32/esp32-common.ini
+++ b/variants/esp32/esp32-common.ini
@@ -7,6 +7,9 @@ platform =
   # TODO renovate
   https://github.com/pioarduino/platform-espressif32/releases/download/55.03.38-1/platform-espressif32.zip
   ; https://github.com/pioarduino/platform-espressif32.git#develop
+platform_packages =
+  # renovate: datasource=custom.pio depName=platformio/tool-mklittlefs packageName=platformio/tool/tool-mklittlefs
+  platformio/tool-mklittlefs@1.203.210628
 
 extra_scripts =
   ${env.extra_scripts}
diff --git a/variants/esp32/esp32.ini b/variants/esp32/esp32.ini
index e05bcd39e..201669bee 100644
--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -47,7 +47,6 @@ lib_deps =
   ${radiolib_base.lib_deps}
   ${environmental_base.lib_deps}
   ${environmental_extra_no_bsec.lib_deps}
-  ${radiolib_base.lib_deps}
   # TODO renovate
   https://github.com/mverch67/libpax/archive/6f52ee989301cdabaeef00bcbf93bff55708ce2f.zip
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
diff --git a/variants/esp32s3/rak3312/platformio.ini b/variants/esp32s3/rak3312/platformio.ini
index 87e5b63ff..dcdb2974c 100644
--- a/variants/esp32s3/rak3312/platformio.ini
+++ b/variants/esp32s3/rak3312/platformio.ini
@@ -29,7 +29,7 @@ board_level = extra
 upload_protocol = esptool
 
 build_flags =
-  ${esp32_base.build_flags}
+  ${esp32s3_base.build_flags}
   -D RAK3312 
   -D _VARIANT_RAK3112_
   -I variants/esp32s3/rak3312