diff --git a/.github/workflows/cron.yml b/.github/disabled-workflows/cron.yml
similarity index 100%
rename from .github/workflows/cron.yml
rename to .github/disabled-workflows/cron.yml
diff --git a/.github/workflows/repository_dispatch.yml b/.github/disabled-workflows/repository_dispatch.yml
similarity index 100%
rename from .github/workflows/repository_dispatch.yml
rename to .github/disabled-workflows/repository_dispatch.yml
diff --git a/configs/defconfig.common b/configs/defconfig.common
index cbcfd8d2c..801ca376c 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -67,7 +67,8 @@ CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
-# CONFIG_SPI_MASTER_ISR_IN_IRAM is not set
+CONFIG_SPI_MASTER_IN_IRAM=y
+CONFIG_SPI_MASTER_ISR_IN_IRAM=y
 # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
@@ -92,3 +93,20 @@ CONFIG_ESP_COREDUMP_STACK_SIZE=1024
 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
 CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
 CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
+
+# Power Management
+CONFIG_PM_ENABLE=y
+CONFIG_PM_SLP_IRAM_OPT=y
+CONFIG_PM_RTOS_IDLE_OPT=y
+CONFIG_PM_SLP_DISABLE_GPIO=y
+CONFIG_PM_SLP_DEFAULT_PARAMS_OPT=y
+CONFIG_PM_LIGHTSLEEP_RTC_OSC_CAL_INTERVAL=1
+CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
+CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3
+CONFIG_BT_CTRL_MODEM_SLEEP=y
+CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y
+CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y
+CONFIG_BT_CTRL_MAIN_XTAL_PU_DURING_LIGHT_SLEEP=y
+CONFIG_ESP_PHY_MAC_BB_PD=y
+CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT=y
+CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index bd38b4829..0b455e3e0 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -20,4 +20,5 @@ CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
 CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
 CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
 CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
-CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
\ No newline at end of file
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256=y
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index 31c42f7a0..76604d8ae 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -2,3 +2,4 @@ CONFIG_BT_BLE_BLUFI_ENABLE=y
 CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
+CONFIG_ESP32C3_RTC_CLK_SRC_INT_8MD256=y
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index 6dc619a9f..d70acb706 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -5,4 +5,5 @@ CONFIG_ESP32S2_KEEP_USB_ALIVE=y
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 # CONFIG_USE_WAKENET is not set
 # CONFIG_USE_MULTINET is not set
-CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
\ No newline at end of file
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256=y
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 981e224fd..88a9c448c 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -10,4 +10,5 @@ CONFIG_SR_WN_WN8_HIESP=y
 CONFIG_SR_MN_ENGLISH=y
 CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
-CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
\ No newline at end of file
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
+CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256=y
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index 0d562a892..536025649 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -16,6 +16,9 @@ if [ ! -d "$IDF_PATH" ]; then
 	echo "ESP-IDF is not installed! Installing local copy"
 	git clone $IDF_REPO_URL -b $IDF_BRANCH
 	idf_was_installed="1"
+else
+    git -C "$IDF_PATH" fetch
+    git -C "$IDF_PATH" reset --hard
 fi
 
 if [ "$IDF_COMMIT" ]; then
diff --git a/tools/update-components.sh b/tools/update-components.sh
index bd0e394a5..e96ddb9e4 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -1,5 +1,6 @@
 #/bin/bash
 
+set -e
 source ./tools/config.sh
 
 CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
@@ -16,6 +17,9 @@ TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
 echo "Updating ESP32 Arduino..."
 if [ ! -d "$AR_COMPS/arduino" ]; then
 	git clone $AR_REPO_URL "$AR_COMPS/arduino"
+else
+    git -C "$AR_COMPS/arduino" fetch
+	git -C "$AR_COMPS/arduino" reset --hard
 fi
 
 if [ -z $AR_BRANCH ]; then
@@ -28,7 +32,7 @@ if [ -z $AR_BRANCH ]; then
 	if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
 		export AR_BRANCH="$current_branch"
 	else
-		if [ -z "$IDF_COMMIT" ]; then #commit was not specified at build time
+		if [ -z "$IDF_COMMIT" ]; then # commit was not specified at build time
 			AR_BRANCH_NAME="idf-$IDF_BRANCH"
 		else
 			AR_BRANCH_NAME="idf-$IDF_COMMIT"
@@ -46,11 +50,8 @@ if [ -z $AR_BRANCH ]; then
 fi
 
 if [ "$AR_BRANCH" ]; then
-	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"
 fi
-if [ $? -ne 0 ]; then exit 1; fi
 
 #
 # CLONE/UPDATE ESP32-CAMERA
@@ -59,45 +60,48 @@ echo "Updating ESP32 Camera..."
 if [ ! -d "$AR_COMPS/esp32-camera" ]; then
 	git clone $CAMERA_REPO_URL "$AR_COMPS/esp32-camera"
 else
-	git -C "$AR_COMPS/esp32-camera" fetch && \
-	git -C "$AR_COMPS/esp32-camera" pull --ff-only
+	git -C "$AR_COMPS/esp32-camera" fetch
+	git -C "$AR_COMPS/esp32-camera" reset --hard
 fi
-if [ $? -ne 0 ]; then exit 1; fi
+git -C "$AR_COMPS/esp32-camera" checkout tags/v2.0.15
 
 #
 # CLONE/UPDATE ESP-DL
 #
 echo "Updating ESP-DL..."
 if [ ! -d "$AR_COMPS/esp-dl" ]; then
-	git clone $DL_REPO_URL "$AR_COMPS/esp-dl" && \
-	git -C "$AR_COMPS/esp-dl" reset --hard 0632d2447dd49067faabe9761d88fa292589d5d9
-	if [ $? -ne 0 ]; then exit 1; fi
+	git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
+else
+    git -C "$AR_COMPS/esp-dl" fetch
+    git -C "$AR_COMPS/esp-dl" reset --hard
 fi
+git -C "$AR_COMPS/esp-dl" checkout 0632d2447dd49067faabe9761d88fa292589d5d9
 
 #
 # CLONE/UPDATE ESP-LITTLEFS
 #
 echo "Updating ESP-LITTLEFS..."
 if [ ! -d "$AR_COMPS/esp_littlefs" ]; then
-	git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \
-    git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
+	git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs"
 else
-	git -C "$AR_COMPS/esp_littlefs" fetch && \
-	git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \
-    git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
+	git -C "$AR_COMPS/esp_littlefs" fetch
+	git -C "$AR_COMPS/esp_littlefs" reset --hard
 fi
-if [ $? -ne 0 ]; then exit 1; fi
+git -C "$AR_COMPS/esp_littlefs" checkout tags/v1.16.4
+git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
 
 #
 # CLONE/UPDATE ESP-RAINMAKER
 #
 echo "Updating ESP-RainMaker..."
 if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then
-    git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker" && \
-	git -C "$AR_COMPS/esp-rainmaker" reset --hard d8e93454f495bd8a414829ec5e86842b373ff555 && \
-    git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive
+    git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker"
+else
+    git -C "$AR_COMPS/esp-rainmaker" fetch
+    git -C "$AR_COMPS/esp-rainmaker" reset --hard
 fi
-if [ $? -ne 0 ]; then exit 1; fi
+git -C "$AR_COMPS/esp-rainmaker" checkout d8e93454f495bd8a414829ec5e86842b373ff555
+git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive
 
 #
 # CLONE/UPDATE ESP-DSP
@@ -106,10 +110,10 @@ echo "Updating ESP-DSP..."
 if [ ! -d "$AR_COMPS/espressif__esp-dsp" ]; then
 	git clone $DSP_REPO_URL "$AR_COMPS/espressif__esp-dsp"
 else
-	git -C "$AR_COMPS/espressif__esp-dsp" fetch && \
-	git -C "$AR_COMPS/espressif__esp-dsp" pull --ff-only
+    git -C "$AR_COMPS/espressif__esp-dsp" fetch
+	git -C "$AR_COMPS/espressif__esp-dsp" reset --hard
 fi
-if [ $? -ne 0 ]; then exit 1; fi
+git -C "$AR_COMPS/espressif__esp-dsp" checkout tags/v1.6.1
 
 #
 # CLONE/UPDATE TINYUSB
@@ -118,8 +122,8 @@ echo "Updating TinyUSB..."
 if [ ! -d "$AR_COMPS/arduino_tinyusb/tinyusb" ]; then
 	git clone $TINYUSB_REPO_URL "$AR_COMPS/arduino_tinyusb/tinyusb"
 else
-	git -C "$AR_COMPS/arduino_tinyusb/tinyusb" fetch && \
-	git -C "$AR_COMPS/arduino_tinyusb/tinyusb" pull --ff-only
+	git -C "$AR_COMPS/arduino_tinyusb/tinyusb" fetch
+	git -C "$AR_COMPS/arduino_tinyusb/tinyusb" reset --hard
 fi
-if [ $? -ne 0 ]; then exit 1; fi
-
+git -C "$AR_COMPS/arduino_tinyusb/tinyusb" checkout 0.15.0
+git -C "$AR_COMPS/arduino_tinyusb/tinyusb" submodule update --init --recursive