diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index f973a42ef..2bb963367 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -1,12 +1,75 @@
 #!/bin/bash
 
-IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
-IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD || echo "")
 idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT"
 
-archive_path="dist/arduino-esp32-libs-$1-$idf_version_string.tar.gz"
+archive_path="dist/arduino-esp32-libs-$TARGET-$idf_version_string.tar.gz"
+build_archive_path="dist/arduino-esp32-build-$TARGET-$idf_version_string.tar.gz"
+pio_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.tar.gz"
+pio_zip_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.zip"
 
-mkdir -p dist && rm -rf "$archive_path"
-if [ -d "out" ]; then
-	cd out && tar zcf "../$archive_path" * && cd ..
-fi
+rm -rf dist
+mkdir -p dist
+
+cd out
+echo "Creating PlatformIO framework-arduinoespressif32"
+mkdir -p arduino-esp32/cores/esp32
+mkdir -p arduino-esp32/tools/partitions
+cp -rf ../components/arduino/tools arduino-esp32
+cp -rf ../components/arduino/cores arduino-esp32
+cp -rf ../components/arduino/libraries arduino-esp32
+cp -rf ../components/arduino/variants arduino-esp32
+cp -rf ../components/arduino/CMa* arduino-esp32
+cp -rf ../components/arduino/idf* arduino-esp32
+cp -rf ../components/arduino/Kco* arduino-esp32
+cp -rf ../components/arduino/pac* arduino-esp32
+rm -rf arduino-esp32/docs
+rm -rf arduino-esp32/tests
+rm -rf arduino-esp32/idf_component_examples
+# rm -rf arduino-esp32/libraries/RainMaker
+# rm -rf arduino-esp32/libraries/Insights
+# rm -rf arduino-esp32/libraries/ESP_I2S
+# rm -rf arduino-esp32/libraries/SPIFFS
+# rm -rf arduino-esp32/libraries/BLE
+# rm -rf arduino-esp32/libraries/SimpleBLE
+# rm -rf arduino-esp32/libraries/BluetoothSerial
+# rm -rf arduino-esp32/libraries/WiFiProv
+# rm -rf arduino-esp32/libraries/WiFiClientSecure
+# rm -rf arduino-esp32/libraries/NetworkClientSecure
+# rm -rf arduino-esp32/libraries/ESP_SR
+# rm -rf arduino-esp32/libraries/ESP_NOW
+# rm -rf arduino-esp32/libraries/TFLiteMicro
+# rm -rf arduino-esp32/libraries/ESP32
+rm -rf arduino-esp32/package
+rm -rf arduino-esp32/tools/esp32-arduino-libs
+rm -rf arduino-esp32/tools/*.exe
+rm -rf arduino-esp32/tools/esptool.py
+rm -rf arduino-esp32/tools/get.py
+rm -rf arduino-esp32/tools/ide-debug
+rm -rf arduino-esp32/tools/gen_insights_package.py
+rm -rf arduino-esp32/platform.txt
+rm -rf arduino-esp32/programmers.txt
+rm -rf arduino-esp32/boards.txt
+rm -rf arduino-esp32/package.json
+rm -rf arduino-esp32/*.md
+cp -rf tools/esp32-arduino-libs arduino-esp32/tools/
+cp /app/esp32-arduino-lib-builder/out/tools/esp32-arduino-libs/package.json arduino-esp32/package.json
+
+#cp ../core_version.h arduino-esp32/cores/esp32/core_version.h
+rm -rf arduino-esp32/cores/esp32/core_version.h
+touch arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_GIT_VER 0xa92d49f" >> arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_GIT_DESC 3.0.2" >> arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_RELEASE_3_0_2" >> arduino-esp32/cores/esp32/core_version.h
+echo "#define ARDUINO_ESP32_RELEASE \"3_0_2\"" >> arduino-esp32/cores/esp32/core_version.h
+
+rm -rf framework-arduinoespressif32/
+mv arduino-esp32/ framework-arduinoespressif32/
+cd framework-arduinoespressif32/libraries
+rm -rf **/examples
+cd ../tools/esp32-arduino-libs
+rm -rf **/flags
+cd ../../../
+# If the framework is needed as tar.gz uncomment next line
+# tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/
+rm -rf ../$pio_zip_archive_path
+7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/
diff --git a/tools/install-arduino.sh b/tools/install-arduino.sh
index 51e1162a4..235a9273c 100755
--- a/tools/install-arduino.sh
+++ b/tools/install-arduino.sh
@@ -41,9 +41,9 @@ fi
 
 if [ "$AR_BRANCH" ]; then
 	echo "AR_BRANCH='$AR_BRANCH'"
-	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
-	git -C "$AR_COMPS/arduino" fetch && \
-	git -C "$AR_COMPS/arduino" pull --ff-only
+	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH"
+	git -C "$AR_COMPS/arduino" fetch
+	git -C "$AR_COMPS/arduino" pull --ff-only || true
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
@@ -55,8 +55,8 @@ if [ ! -d "$IDF_LIBS_DIR" ]; then
 	git clone "$AR_LIBS_REPO_URL" "$IDF_LIBS_DIR"
 else
 	echo "Updating esp32-arduino-libs..."
-	git -C "$IDF_LIBS_DIR" fetch && \
-	git -C "$IDF_LIBS_DIR" pull --ff-only
+	git -C "$IDF_LIBS_DIR" fetch
+	git -C "$IDF_LIBS_DIR" pull --ff-only || true
 fi
 if [ $? -ne 0 ]; then exit 1; fi