diff --git a/flash-scripts/linux/install-recovery-boot.sh b/flash-scripts/linux/install-e-recovery-vendor-boot.sh
old mode 100755
new mode 100644
similarity index 100%
rename from flash-scripts/linux/install-recovery-boot.sh
rename to flash-scripts/linux/install-e-recovery-vendor-boot.sh
diff --git a/flash-scripts/linux/install-zipped-recovery-boot.sh b/flash-scripts/linux/install-zipped-recovery-boot.sh
index 8fe648365ec55540cf906df7953221027dc8274d..ac287d99b3afa9a8a60fc174719580397d5faf26 100755
--- a/flash-scripts/linux/install-zipped-recovery-boot.sh
+++ b/flash-scripts/linux/install-zipped-recovery-boot.sh
@@ -52,10 +52,7 @@ then
 fi
 
 echo "Flashing boot $DEVICE_ID"
-"$FASTBOOT_PATH" flash boot "$OUTPUT_FOLDER"/boot-*-redfin.img
+"$FASTBOOT_PATH" flash boot "$OUTPUT_FOLDER"/recovery-*-*.img
 
 echo "Flashing dtbo $DEVICE_ID"
-"$FASTBOOT_PATH" flash dtbo "$OUTPUT_FOLDER"/dtbo-*-redfin.img
-
-echo "Flash the recovery $DEVICE_ID"
-"$FASTBOOT_PATH" flash vendor_boot "$OUTPUT_FOLDER"/recovery-*-redfin.img
+"$FASTBOOT_PATH" flash dtbo "$OUTPUT_FOLDER"/dtbo-*-*.img
\ No newline at end of file
diff --git a/flash-scripts/linux/install-zipped-recovery-vendor-boot.sh b/flash-scripts/linux/install-zipped-recovery-vendor-boot.sh
new file mode 100644
index 0000000000000000000000000000000000000000..dc4080226889bb076d946ac09f67770d9dbe8fad
--- /dev/null
+++ b/flash-scripts/linux/install-zipped-recovery-vendor-boot.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Copyright (C) 2023 Murena SAS - Author: SahilSonar
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# Parameter
+# $1: TWRP_IMAGE_PATH need twrp path (${TWRP_FOLDER}/${TWRP})
+# $2: FASTBOOT_FOLDER_PATH needs fastboot binary path
+# $3: JAVA_FOLDER_PATH needs java binary path
+
+# Exit status
+# - 0 : Recovery installed
+# - 101 : TWRP_IMAGE_PATH missing
+# - 103 : Failed to unzip
+
+TWRP_IMAGE_PATH=$1
+OUTPUT_FOLDER=$(dirname $TWRP_IMAGE_PATH)
+FASTBOOT_FOLDER_PATH=$2
+FASTBOOT_PATH=${FASTBOOT_FOLDER_PATH}"fastboot"
+JAVA_FOLDER_PATH=$3
+JAR_PATH=${JAVA_FOLDER_PATH}"/bin/jar"
+
+echo "fastboot path: $FASTBOOT_PATH"
+
+if [ -z "$TWRP_IMAGE_PATH" ]
+then
+	echo "TWRP Image path is empty"
+  	exit 101
+fi
+
+# Delete any existing *.img files in OUTPUT_FOLDER
+rm -rf "$OUTPUT_FOLDER"/*.img
+rm -rf "$OUTPUT_FOLDER"/*.img.sha256sum
+
+# Use jar tool to extract all .img files from the zip archive
+cd "$OUTPUT_FOLDER" || exit 102
+if ! "$JAR_PATH" -x -v -f "$TWRP_IMAGE_PATH" ;
+then
+  exit 103
+fi
+
+echo "Flashing boot $DEVICE_ID"
+"$FASTBOOT_PATH" flash boot "$OUTPUT_FOLDER"/boot-*-*.img
+
+echo "Flashing dtbo $DEVICE_ID"
+"$FASTBOOT_PATH" flash dtbo "$OUTPUT_FOLDER"/dtbo-*-*.img
+
+echo "Flash the recovery $DEVICE_ID"
+"$FASTBOOT_PATH" flash vendor_boot "$OUTPUT_FOLDER"/recovery-*-*.img
diff --git a/flash-scripts/windows/install-recovery-boot.bat b/flash-scripts/windows/install-e-recovery-vendor-boot.bat
similarity index 100%
rename from flash-scripts/windows/install-recovery-boot.bat
rename to flash-scripts/windows/install-e-recovery-vendor-boot.bat
diff --git a/flash-scripts/windows/install-zipped-recovery-boot.bat b/flash-scripts/windows/install-zipped-recovery-boot.bat
index cd64209ebbe76bb8fc85bfbee06546acc8006437..af25a4148d81177964ccff08f2178b3496aad6ea 100644
--- a/flash-scripts/windows/install-zipped-recovery-boot.bat
+++ b/flash-scripts/windows/install-zipped-recovery-boot.bat
@@ -53,10 +53,7 @@ IF %ERRORLEVEL% neq 0 (
 )
 
 echo "Flashing boot"
-for %%I in (%OUTPUT_FOLDER%\boot-*-redfin.img) do %FASTBOOT_PATH% flash boot "%%I"
+for %%I in (%OUTPUT_FOLDER%\recovery-*-*.img) do %FASTBOOT_PATH% flash boot "%%I"
 
 echo "Flashing dtbo"
-for %%I in (%OUTPUT_FOLDER%\dtbo-*-redfin.img) do %FASTBOOT_PATH% flash dtbo "%%I"
-
-echo "Flash the recovery"
-for %%I in (%OUTPUT_FOLDER%\recovery-*-redfin.img) do %FASTBOOT_PATH% flash vendor_boot "%%I"
+for %%I in (%OUTPUT_FOLDER%\dtbo-*-*.img) do %FASTBOOT_PATH% flash dtbo "%%I"
diff --git a/flash-scripts/windows/install-zipped-recovery-vendor-boot.bat b/flash-scripts/windows/install-zipped-recovery-vendor-boot.bat
new file mode 100644
index 0000000000000000000000000000000000000000..d47e4404f2b74ef6c6472d7a87cd8aacee35e17f
--- /dev/null
+++ b/flash-scripts/windows/install-zipped-recovery-vendor-boot.bat
@@ -0,0 +1,62 @@
+@echo off
+
+:: !/bin/bash
+
+::  Copyright (C) 2023 Murena SAS - Author: SahilSonar
+
+::  This program is free software: you can redistribute it and/or modify
+::  it under the terms of the GNU General Public License as published by
+::  the Free Software Foundation, either version 3 of the License, or
+::  (at your option) any later version.
+
+::  This program is distributed in the hope that it will be useful,
+::  but WITHOUT ANY WARRANTY; without even the implied warranty of
+::  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+::  GNU General Public License for more details.
+
+::  You should have received a copy of the GNU General Public License
+::  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+::  Parameter
+::  $1: TWRP_IMAGE_PATH need twrp path (${TWRP_FOLDER}/${TWRP})
+::  $2: FASTBOOT_FOLDER_PATH needs fastboot binary path 
+::  $3: JAVA_FOLDER_PATH needs java binary path
+::  Exit status
+::  - 0 : Recovery installed
+::  - 101 : TWRP_IMAGE_PATH missing
+::  - 103 : Failed to unzip
+
+SET TWRP_IMAGE_PATH=%1
+SET OUTPUT_FOLDER=%~dp1
+SET FASTBOOT_FOLDER_PATH=%2
+SET FASTBOOT_PATH=%FASTBOOT_FOLDER_PATH%fastboot
+SET JAVA_FOLDER_PATH=%3
+SET JAR_PATH=%JAVA_FOLDER_PATH%\bin\jar
+
+echo "fastboot path: %FASTBOOT_PATH%"
+
+IF not defined TWRP_IMAGE_PATH (
+  echo "TWRP Image path is empty"
+  exit /b 101
+)
+
+:: Delete any existing *.img files in OUTPUT_FOLDER
+del /Q %OUTPUT_FOLDER%\*.img
+del /Q %OUTPUT_FOLDER%\*.img.sha256sum
+
+:: Use jar tool to extract all .img files from the zip archive
+cd %OUTPUT_FOLDER% || exit /b 102
+%JAR_PATH% -x -v -f "%TWRP_IMAGE_PATH%"
+
+IF %ERRORLEVEL% neq 0 (
+  exit /b 103
+)
+
+echo "Flashing boot"
+for %%I in (%OUTPUT_FOLDER%\boot-*-*.img) do %FASTBOOT_PATH% flash boot "%%I"
+
+echo "Flashing dtbo"
+for %%I in (%OUTPUT_FOLDER%\dtbo-*-*.img) do %FASTBOOT_PATH% flash dtbo "%%I"
+
+echo "Flash the recovery"
+for %%I in (%OUTPUT_FOLDER%\recovery-*-*.img) do %FASTBOOT_PATH% flash vendor_boot "%%I"
diff --git a/src/main/resources/yaml/OnePlus7Pro_flash.yml b/src/main/resources/yaml/OnePlus7Pro_flash.yml
index 2704418118896693fafe99cf57f08e82c80fc522..5fff707b0c6f9d50fcb311aebc19633cf779eaf6 100644
--- a/src/main/resources/yaml/OnePlus7Pro_flash.yml
+++ b/src/main/resources/yaml/OnePlus7Pro_flash.yml
@@ -113,10 +113,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery-boot 
+        script: install-zipped-recovery-boot 
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/OnePlus7Pro_fs.yml b/src/main/resources/yaml/OnePlus7Pro_fs.yml
index 006df80e6a5c6cbb1dba6af5898e8e6157c077e2..48f9853e80d455190c4ec6751f49aa93e6211331 100644
--- a/src/main/resources/yaml/OnePlus7Pro_fs.yml
+++ b/src/main/resources/yaml/OnePlus7Pro_fs.yml
@@ -16,11 +16,11 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/dev/guacamole/e-latest-s-guacamole.zip
-    filePath: e-latest-s-guacamole.zip
+    url: https://images.ecloud.global/dev/guacamole/e-latest-t-guacamole.zip
+    filePath: e-latest-t-guacamole.zip
   twrp:
-    url: https://images.ecloud.global/dev/guacamole/recovery-e-latest-s-guacamole.img
-    filePath: recovery-e-latest-s-guacamole.img
+    url: https://images.ecloud.global/dev/guacamole/recovery-IMG-e-latest-t-guacamole.zip
+    filePath: recovery-IMG-e-latest-t-guacamole.img
   patch: 
     url: https://images.ecloud.global/stable/copy-partitions-20210323_1922.zip
     filePath: copy-partitions-20210323_1922.zip
diff --git a/src/main/resources/yaml/OnePlus7T_flash.yml b/src/main/resources/yaml/OnePlus7T_flash.yml
index d00ee101184fc5faa142c86ee20830494fe7126a..5fff707b0c6f9d50fcb311aebc19633cf779eaf6 100644
--- a/src/main/resources/yaml/OnePlus7T_flash.yml
+++ b/src/main/resources/yaml/OnePlus7T_flash.yml
@@ -113,10 +113,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery 
+        script: install-zipped-recovery-boot 
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/OnePlus7T_fs.yml b/src/main/resources/yaml/OnePlus7T_fs.yml
index 4385f1eb8b53205b2397545538cbeb39538cec47..6f9469fd971597fcd78d7be044d9777c6134440f 100644
--- a/src/main/resources/yaml/OnePlus7T_fs.yml
+++ b/src/main/resources/yaml/OnePlus7T_fs.yml
@@ -16,11 +16,11 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/dev/hotdogb/e-latest-s-hotdogb.zip
-    filePath: e-latest-s-hotdogb.zip
+    url: https://images.ecloud.global/dev/hotdogb/e-latest-t-hotdogb.zip
+    filePath: e-latest-t-hotdogb.zip
   twrp:
-    url: https://images.ecloud.global/dev/hotdogb/recovery-e-latest-s-hotdogb.img
-    filePath: recovery-e-latest-s-hotdogb.img
+    url: https://images.ecloud.global/dev/hotdogb/recovery-IMG-e-latest-t-hotdogb.zip
+    filePath: recovery-IMG-e-latest-t-hotdogb.zip
   patch: 
     url: https://images.ecloud.global/stable/copy-partitions-20210323_1922.zip
     filePath: copy-partitions-20210323_1922.zip
diff --git a/src/main/resources/yaml/OnePlus8Pro_flash.yml b/src/main/resources/yaml/OnePlus8Pro_flash.yml
index 05809819647526ec1644dfcf052e562d2788c2e0..1bd9d3f17b7901cd29034b7e60cbc2bf1c0f75d1 100644
--- a/src/main/resources/yaml/OnePlus8Pro_flash.yml
+++ b/src/main/resources/yaml/OnePlus8Pro_flash.yml
@@ -114,10 +114,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery 
+        script: install-zipped-recovery-boot 
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/OnePlus8Pro_fs.yml b/src/main/resources/yaml/OnePlus8Pro_fs.yml
index be079dfc19876b6a904b8e584eb05b0c4b643742..f78c4727f06982085021ea7915afef4d18b97b3e 100644
--- a/src/main/resources/yaml/OnePlus8Pro_fs.yml
+++ b/src/main/resources/yaml/OnePlus8Pro_fs.yml
@@ -16,11 +16,11 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/dev/instantnoodlep/e-latest-s-instantnoodlep.zip
-    filePath: e-latest-s-instantnoodlep.zip
+    url: https://images.ecloud.global/dev/instantnoodlep/e-latest-t-instantnoodlep.zip
+    filePath: e-latest-t-instantnoodlep.zip
   twrp:
-    url: https://images.ecloud.global/dev/instantnoodlep/recovery-e-latest-s-instantnoodlep.img
-    filePath: recovery-e-latest-s-instantnoodlep.img
+    url: https://images.ecloud.global/dev/instantnoodlep/recovery-IMG-e-latest-t-instantnoodlep.zip
+    filePath: recovery-e-latest-t-instantnoodlep.img
   patch:
     url: https://images.ecloud.global/stable/copy-partitions-20210323_1922.zip
     filePath: copy-partitions-20210323_1922.zip
diff --git a/src/main/resources/yaml/OnePlus8_flash.yml b/src/main/resources/yaml/OnePlus8_flash.yml
index 05809819647526ec1644dfcf052e562d2788c2e0..1bd9d3f17b7901cd29034b7e60cbc2bf1c0f75d1 100644
--- a/src/main/resources/yaml/OnePlus8_flash.yml
+++ b/src/main/resources/yaml/OnePlus8_flash.yml
@@ -114,10 +114,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery 
+        script: install-zipped-recovery-boot 
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/OnePlus8_fs.yml b/src/main/resources/yaml/OnePlus8_fs.yml
index 7c6a3b811952de8c37ecab6e107351e0d09669a7..377512915a034577ba94526fc671a528f7ae4002 100644
--- a/src/main/resources/yaml/OnePlus8_fs.yml
+++ b/src/main/resources/yaml/OnePlus8_fs.yml
@@ -16,11 +16,11 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/dev/instantnoodle/e-latest-s-instantnoodle.zip
-    filePath: e-latest-s-instantnoodle.zip
+    url: https://images.ecloud.global/dev/instantnoodle/e-latest-t-instantnoodle.zip
+    filePath: e-latest-t-instantnoodle.zip
   twrp:
-    url: https://images.ecloud.global/dev/instantnoodle/recovery-e-latest-s-instantnoodle.img
-    filePath: recovery-e-latest-s-instantnoodle.img
+    url: https://images.ecloud.global/dev/instantnoodle/recovery-IMG-e-latest-t-instantnoodle.zip
+    filePath: recovery-IMG-e-latest-t-instantnoodle.zip
   patch: 
     url: https://images.ecloud.global/stable/copy-partitions-20210323_1922.zip
     filePath: copy-partitions-20210323_1922.zip
diff --git a/src/main/resources/yaml/OnePlusNord_flash.yml b/src/main/resources/yaml/OnePlusNord_flash.yml
index 9774b0a709933e260275a3789516d9cf336370e4..50e4b3766413bc0c732c6f2f275c80429e99087c 100644
--- a/src/main/resources/yaml/OnePlusNord_flash.yml
+++ b/src/main/resources/yaml/OnePlusNord_flash.yml
@@ -114,10 +114,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery 
+        script: install-zipped-recovery-boot 
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/OnePlusNord_fs.yml b/src/main/resources/yaml/OnePlusNord_fs.yml
index ebdb46c60f0781791d37cc0505834ca65ecf8139..fdad8e5d15715e9c00e2958ecb25a320a9a52557 100644
--- a/src/main/resources/yaml/OnePlusNord_fs.yml
+++ b/src/main/resources/yaml/OnePlusNord_fs.yml
@@ -16,8 +16,8 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/stable/avicii/e-latest-s-avicii.zip
-    filePath: e-latest-s-avicii.zip
+    url: https://images.ecloud.global/dev/avicii/e-latest-t-avicii.zip
+    filePath: e-latest-t-avicii.zip
   twrp:
-    url: https://images.ecloud.global/stable/avicii/recovery-e-latest-s-avicii.img
-    filePath: recovery-e-latest-s-avicii.img
+    url: https://images.ecloud.global/dev/avicii/recovery-IMG-e-latest-t-avicii.zip
+    filePath: recovery-IMG-e-latest-t-avicii.zip
diff --git a/src/main/resources/yaml/bramble_flash.yml b/src/main/resources/yaml/bramble_flash.yml
index 0677fec952da06835d5070030ed28cc400e70fa2..8563428ae2293ba0783707a010fb76bf40200a06 100644
--- a/src/main/resources/yaml/bramble_flash.yml
+++ b/src/main/resources/yaml/bramble_flash.yml
@@ -76,10 +76,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery-boot
+        script: install-zipped-recovery-boot
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/bramble_fs.yml b/src/main/resources/yaml/bramble_fs.yml
index 1f15a65a570e20f47060dbe7375256f31d8ed0fd..83591974f73f687fdcd2f865f24a754d9815efdc 100644
--- a/src/main/resources/yaml/bramble_fs.yml
+++ b/src/main/resources/yaml/bramble_fs.yml
@@ -16,8 +16,8 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/dev/bramble/e-latest-s-bramble.zip
-    filePath: e-latest-s-bramble.zip
+    url: https://images.ecloud.global/dev/bramble/e-latest-t-bramble.zip
+    filePath: e-latest-t-bramble.zip
   twrp:
-    url: https://images.ecloud.global/dev/bramble/recovery-e-latest-s-bramble.img
-    filePath: recovery-e-latest-s-bramble.img
+    url: https://images.ecloud.global/dev/bramble/recovery-IMG-e-latest-t-bramble.img
+    filePath: recovery-IMG-e-latest-t-bramble.img 
diff --git a/src/main/resources/yaml/coral_flash.yml b/src/main/resources/yaml/coral_flash.yml
index b8cba20fd99f0ea0e71b0fe94639145087ddd9ff..c5bdde47084b383eb54f749948c273ab06106ccc 100644
--- a/src/main/resources/yaml/coral_flash.yml
+++ b/src/main/resources/yaml/coral_flash.yml
@@ -76,10 +76,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery-boot
+        script: install-zipped-recovery-boot
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/coral_fs.yml b/src/main/resources/yaml/coral_fs.yml
index 2a04865a150801a487e7b80ee2b70515d7d3264e..f345d86febfdf72ecbf20dd35c7f07bfde74684d 100644
--- a/src/main/resources/yaml/coral_fs.yml
+++ b/src/main/resources/yaml/coral_fs.yml
@@ -16,9 +16,9 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/dev/coral/e-latest-s-coral.zip
-    filePath: e-latest-s-coral.zip
+    url: https://images.ecloud.global/dev/coral/e-latest-t-coral.zip
+    filePath: e-latest-t-coral.zip
   twrp:
-    url: https://images.ecloud.global/dev/coral/recovery-e-latest-s-coral.img
-    filePath: recovery-e-latest-s-coral.img
+    url: https://images.ecloud.global/dev/coral/recovery-IMG-latest-t-coral.zip
+    filePath: recovery-IMG-e-latest-t-coral.zip
     
diff --git a/src/main/resources/yaml/redfin_flash.yml b/src/main/resources/yaml/redfin_flash.yml
index 253d3ad4c97e0c478ed602d58bf5830b37b13025..b3afe6e3a46d7d8f6a98c0ce8a6c812b2c02dd04 100644
--- a/src/main/resources/yaml/redfin_flash.yml
+++ b/src/main/resources/yaml/redfin_flash.yml
@@ -77,7 +77,7 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-zipped-recovery-boot
+        script: install-zipped-recovery-vendor-boot
         parameters: 
             twrp_image_path: ${TWRP_IMAGE_PATH}
             fastboot_folder_path: ${ADB_FOLDER_PATH}
diff --git a/src/main/resources/yaml/sunfish_flash.yml b/src/main/resources/yaml/sunfish_flash.yml
index b8cba20fd99f0ea0e71b0fe94639145087ddd9ff..c5bdde47084b383eb54f749948c273ab06106ccc 100644
--- a/src/main/resources/yaml/sunfish_flash.yml
+++ b/src/main/resources/yaml/sunfish_flash.yml
@@ -76,10 +76,11 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery-boot
+        script: install-zipped-recovery-boot
         parameters: 
-            fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
+            fastboot_folder_path: ${ADB_FOLDER_PATH}
+            java_folder_path: ${JAVA_FOLDER_PATH}
         okCodes:
             0: ~
         koCodes: 
diff --git a/src/main/resources/yaml/sunfish_fs.yml b/src/main/resources/yaml/sunfish_fs.yml
index cbd30f34b890cb2d04331e4ee789836a565eaaff..f865cc8c1518d2fc9015022ba93f7478af36fa62 100644
--- a/src/main/resources/yaml/sunfish_fs.yml
+++ b/src/main/resources/yaml/sunfish_fs.yml
@@ -16,8 +16,8 @@
 ---
 sources:
   rom:
-    url: https://images.ecloud.global/dev/sunfish/e-latest-s-sunfish.zip
-    filePath: e-latest-s-sunfish.zip
+    url: https://images.ecloud.global/dev/sunfish/e-latest-t-sunfish.zip
+    filePath: e-latest-t-sunfish.zip
   twrp:
-    url: https://images.ecloud.global/dev/sunfish/recovery-e-latest-s-sunfish.img
-    filePath: recovery-e-latest-s-sunfish.img
+    url: https://images.ecloud.global/dev/sunfish/recovery-IMG-e-latest-t-sunfish.zip
+    filePath: recovery-IMG-e-latest-t-sunfish.zip