diff --git a/flash-scripts/windows/install-from-e-recovery.bat b/flash-scripts/windows/install-from-e-recovery.bat
index afe42383ce0aa637804dd809209d15e0bab70db5..74e12acc036f36717a8bedc00857a189f44bef7b 100644
--- a/flash-scripts/windows/install-from-e-recovery.bat
+++ b/flash-scripts/windows/install-from-e-recovery.bat
@@ -30,7 +30,7 @@ SET ARCHIVE_FILE=%~2
 SET FASTBOOT_FOLDER_PATH=%~3
 
 SET ADB_CMD="%FASTBOOT_FOLDER_PATH%adb"
-%ADB_CMD% sideload %ARCHIVE_FILE%
+%ADB_CMD% -s %DEVICE_ID% "sideload" "%ARCHIVE_FILE%"
 if errorlevel==0 (
   echo "Sideload OK"
   exit /b 0
diff --git a/src/main/resources/yaml/hero2lte_flash.yml b/src/main/resources/yaml/hero2lte_flash.yml
index f9d5ace455c98792f172f17c3d49188f03d231c1..b8eaed778732fb9a7085eba410253271134f3b54 100644
--- a/src/main/resources/yaml/hero2lte_flash.yml
+++ b/src/main/resources/yaml/hero2lte_flash.yml
@@ -12,7 +12,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
-## Author: Vincent Bourgmayer
+## Author: Vincent Bourgmayer, Jan Altensen
 ---
 stepsCount: 6
 steps:
@@ -20,8 +20,10 @@ steps:
         type: custom-executable
         stepNumber: 1
         nextStepKey: f1
-        titleKey: stepTitle1On7
-        instructions: 
+        titleKey: stepTitle_oemUnlock
+        instructions:
+            - install_instr_openSettingsThenDevOptions
+            - install_instr_enableOEMUnlock
             - install_instr_turnOff
             - install_instr_startDownload
             - install_instr_acceptWarning
@@ -58,9 +60,14 @@ steps:
         instructions: 
             - install_instr_leaveDownload
             - install_instr_startRecovery
-            - install_instr_swipeTwrp
+            - install_instr_e_recovery_factory_reset
+            - install_instr_e_recovery_factory_reset_format_data
+            - install_instr_e_recovery_factory_reset_format_data_validate
+            - install_instr_e_recovery_back
+            - install_instr_e_recovery_apply_update
+            - install_instr_e_recovery_apply_update_from_adb
         titleIconName: icon-download.png
-        script: wait-recovery 
+        script: wait-e-recovery-sideload
         parameters: 
             device_id: ${DEVICE_ID}
             adb_folder_path: ${ADB_FOLDER_PATH}
@@ -69,16 +76,15 @@ steps:
         koCodes: 
             1: script_error_waitRecovery_1
             101: script_error_waitRecovery_101
-            102: script_error_waitRecovery_102
     f3:
         type: load
         stepNumber: 4
         nextStepKey: f4
-        titleKey: stepTitle6On7
+        titleKey: install_instr_eosInstall
         instructions: 
             - install_instr_eosInstall
-        averageTime: 475
-        script: install-from-recovery 
+        averageTime: 150
+        script: install-from-e-recovery
         parameters: 
             device_id: ${DEVICE_ID}
             archive_path: ${ARCHIVE_PATH}
@@ -86,41 +92,18 @@ steps:
         okCodes:
             0: ~
         koCodes: 
-            1: script_error_installFromRecovery_1
-            2: script_error_installFromRecovery_2
-            3: script_error_installFromRecovery_3
-            101: script_error_installFromRecovery_101
-            102: script_error_installFromRecovery_102
+            1: script_error_installFromSideload
     f4:
         type: askAccount
         stepNumber: 5
         nextStepKey: f5
     f5:
-        type: custom-executable
+        type: custom
         stepNumber: 6
         nextStepKey: end
         titleKey: stepTitle7On7
         instructions: 
-            - install_instr_tapWipe
-            - install_instr_tapAdvancedWipe
-            - install_instr_tickData
-            - install_instr_tapRepairChangeFs
-            - install_instr_tapChangeFs
-            - install_instr_tapExt3
-            - install_instr_swipeForOk
-            - install_instr_backX2
-            - install_instr_resizeFs
-            - install_instr_swipeForOk
-            - install_instr_tapRebootSystem
-            - install_instr_doNotInstall
-        titleIconName: icon-search.png
-        script: wait-reboot 
-        parameters: 
-            device_id: ${DEVICE_ID}
-            adb_folder_path: ${ADB_FOLDER_PATH}
-        okCodes:
-            0: ~
-        koCodes: 
-            1: script_error_unknown
-            10: script_error_waitReboot_10
-            101: script_error_waitReboot_101
+            - install_instr_e_recovery_back
+            - install_instr_e_recovery_reboot
+            - eAccount_lbl_alreadyAccount
+        titleKeyIconName: icon-download.png
diff --git a/src/main/resources/yaml/hero2lte_fs.yml b/src/main/resources/yaml/hero2lte_fs.yml
index a5bf1bbad101201f89c38654c0847cd7e181754d..b172cbcb95751a1041c92f253e658032d17edeac 100644
--- a/src/main/resources/yaml/hero2lte_fs.yml
+++ b/src/main/resources/yaml/hero2lte_fs.yml
@@ -16,8 +16,8 @@
 ---
 sources: 
    rom:
-        url: https://images.ecloud.global/stable/hero2lte/e-latest-hero2lte.zip
-        filePath: e-latest-hero2lte.zip
+        url: https://images.ecloud.global/stable/hero2lte/e-latest-q-hero2lte.zip
+        filePath: e-latest-q-hero2lte.zip
    twrp:         
-        url: https://images.ecloud.global/stable/twrp/hero2lte/twrp-3.2.3-0-hero2lte.img
-        filePath: twrp-3.2.3-0-hero2lte.img
\ No newline at end of file
+        url: https://images.ecloud.global/stable/hero2lte/recovery-e-latest-q-hero2lte.img
+        filePath: recovery-e-latest-q-hero2lte.img
diff --git a/src/main/resources/yaml/herolte_flash.yml b/src/main/resources/yaml/herolte_flash.yml
index f9d5ace455c98792f172f17c3d49188f03d231c1..b8eaed778732fb9a7085eba410253271134f3b54 100644
--- a/src/main/resources/yaml/herolte_flash.yml
+++ b/src/main/resources/yaml/herolte_flash.yml
@@ -12,7 +12,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
-## Author: Vincent Bourgmayer
+## Author: Vincent Bourgmayer, Jan Altensen
 ---
 stepsCount: 6
 steps:
@@ -20,8 +20,10 @@ steps:
         type: custom-executable
         stepNumber: 1
         nextStepKey: f1
-        titleKey: stepTitle1On7
-        instructions: 
+        titleKey: stepTitle_oemUnlock
+        instructions:
+            - install_instr_openSettingsThenDevOptions
+            - install_instr_enableOEMUnlock
             - install_instr_turnOff
             - install_instr_startDownload
             - install_instr_acceptWarning
@@ -58,9 +60,14 @@ steps:
         instructions: 
             - install_instr_leaveDownload
             - install_instr_startRecovery
-            - install_instr_swipeTwrp
+            - install_instr_e_recovery_factory_reset
+            - install_instr_e_recovery_factory_reset_format_data
+            - install_instr_e_recovery_factory_reset_format_data_validate
+            - install_instr_e_recovery_back
+            - install_instr_e_recovery_apply_update
+            - install_instr_e_recovery_apply_update_from_adb
         titleIconName: icon-download.png
-        script: wait-recovery 
+        script: wait-e-recovery-sideload
         parameters: 
             device_id: ${DEVICE_ID}
             adb_folder_path: ${ADB_FOLDER_PATH}
@@ -69,16 +76,15 @@ steps:
         koCodes: 
             1: script_error_waitRecovery_1
             101: script_error_waitRecovery_101
-            102: script_error_waitRecovery_102
     f3:
         type: load
         stepNumber: 4
         nextStepKey: f4
-        titleKey: stepTitle6On7
+        titleKey: install_instr_eosInstall
         instructions: 
             - install_instr_eosInstall
-        averageTime: 475
-        script: install-from-recovery 
+        averageTime: 150
+        script: install-from-e-recovery
         parameters: 
             device_id: ${DEVICE_ID}
             archive_path: ${ARCHIVE_PATH}
@@ -86,41 +92,18 @@ steps:
         okCodes:
             0: ~
         koCodes: 
-            1: script_error_installFromRecovery_1
-            2: script_error_installFromRecovery_2
-            3: script_error_installFromRecovery_3
-            101: script_error_installFromRecovery_101
-            102: script_error_installFromRecovery_102
+            1: script_error_installFromSideload
     f4:
         type: askAccount
         stepNumber: 5
         nextStepKey: f5
     f5:
-        type: custom-executable
+        type: custom
         stepNumber: 6
         nextStepKey: end
         titleKey: stepTitle7On7
         instructions: 
-            - install_instr_tapWipe
-            - install_instr_tapAdvancedWipe
-            - install_instr_tickData
-            - install_instr_tapRepairChangeFs
-            - install_instr_tapChangeFs
-            - install_instr_tapExt3
-            - install_instr_swipeForOk
-            - install_instr_backX2
-            - install_instr_resizeFs
-            - install_instr_swipeForOk
-            - install_instr_tapRebootSystem
-            - install_instr_doNotInstall
-        titleIconName: icon-search.png
-        script: wait-reboot 
-        parameters: 
-            device_id: ${DEVICE_ID}
-            adb_folder_path: ${ADB_FOLDER_PATH}
-        okCodes:
-            0: ~
-        koCodes: 
-            1: script_error_unknown
-            10: script_error_waitReboot_10
-            101: script_error_waitReboot_101
+            - install_instr_e_recovery_back
+            - install_instr_e_recovery_reboot
+            - eAccount_lbl_alreadyAccount
+        titleKeyIconName: icon-download.png
diff --git a/src/main/resources/yaml/herolte_fs.yml b/src/main/resources/yaml/herolte_fs.yml
index 33f682b9a5a629c53aea78e98ca437eed6cce02f..adfe74fa6d263bf283528e7b627f2e7dbcde4625 100644
--- a/src/main/resources/yaml/herolte_fs.yml
+++ b/src/main/resources/yaml/herolte_fs.yml
@@ -16,8 +16,8 @@
 ---
 sources: 
    rom:
-        url: https://images.ecloud.global/stable/herolte/e-latest-herolte.zip
-        filePath: e-latest-herolte.zip
+        url: https://images.ecloud.global/stable/herolte/e-latest-q-herolte.zip
+        filePath: e-latest-q-herolte.zip
    twrp:         
-        url: https://images.ecloud.global/stable/twrp/herolte/twrp-3.2.3-0-herolte.img
-        filePath: twrp-3.2.3-0-herolte.img
\ No newline at end of file
+        url: https://images.ecloud.global/stable/herolte/recovery-e-latest-q-herolte.img
+        filePath: recovery-e-latest-q-herolte.img