diff --git a/.cache/Sonoff.json b/.cache/Sonoff.json
new file mode 100644
index 0000000..d7c2ecc
--- /dev/null
+++ b/.cache/Sonoff.json
@@ -0,0 +1 @@
+[{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/snzb-05p_v1.0.2.ota","fw_file_version":4098,"fw_filesize":267632,"fw_image_type":2059,"fw_manufacturer_id":4742,"model_id":"SNZB-05P"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbminir2_v1.0.2.ota","fw_file_version":4098,"fw_filesize":275788,"fw_image_type":8,"fw_manufacturer_id":4742,"model_id":"ZBMINIR2"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/snzb-02dr2_v1.0.3.ota","fw_file_version":4099,"fw_filesize":212336,"fw_image_type":2064,"fw_manufacturer_id":4742,"model_id":"SNZB-02DR2"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-2C-120"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-2C-120"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-1C-120"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-3C-120"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-1C-80"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-2C-80"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-3C-80"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-1C-86"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-2C-86"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota","fw_file_version":4100,"fw_filesize":294932,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-3C-86"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-1C-120"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-3C-120"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-1C-80"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-2C-80"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-3C-80"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-1C-86"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-2C-86"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota","fw_file_version":4100,"fw_filesize":273908,"fw_image_type":9,"fw_manufacturer_id":4742,"model_id":"ZBM5-3C-86"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/snzb-06p_v1.0.5.ota","fw_file_version":4101,"fw_filesize":258206,"fw_image_type":2060,"fw_manufacturer_id":4742,"model_id":"SNZB-06P"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbmicro_v1.0.5.ota","fw_file_version":4101,"fw_filesize":269220,"fw_image_type":7,"fw_manufacturer_id":4742,"model_id":"ZBMicro"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.6.ota","fw_file_version":4102,"fw_filesize":295468,"fw_image_type":10,"fw_manufacturer_id":4742,"model_id":"ZBM5-1C-120"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zbminir2_v1.0.8.ota","fw_file_version":4104,"fw_filesize":277180,"fw_image_type":8,"fw_manufacturer_id":4742,"model_id":"ZBMINIR2"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/zigbeeminil2_100E_stand_ota_file.ota","fw_file_version":4110,"fw_filesize":259018,"fw_image_type":4,"fw_manufacturer_id":4742,"model_id":"ZBMINIL2"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/snzb02lwd_v1.1.0.ota","fw_file_version":4352,"fw_filesize":167888,"fw_image_type":2061,"fw_manufacturer_id":4742,"model_id":"SNZB-02LWD"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/86-0001-00001101.zigbee","fw_file_version":4353,"fw_filesize":131086,"fw_image_type":1,"fw_manufacturer_id":4742,"model_id":"ZBMINI-L"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/trvzb_v1.3.0.ota","fw_file_version":4864,"fw_filesize":329856,"fw_image_type":8199,"fw_manufacturer_id":4742,"model_id":"TRVZB"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/trvzb_v1.4.0.ota","fw_file_version":5120,"fw_filesize":332084,"fw_image_type":8199,"fw_manufacturer_id":4742,"model_id":"TRVZB"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/trvzb_v1.4.1.ota","fw_file_version":5121,"fw_filesize":332092,"fw_image_type":8199,"fw_manufacturer_id":4742,"model_id":"TRVZB"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/snzb-02p_v2.2.0.ota","fw_file_version":8704,"fw_filesize":260018,"fw_image_type":2055,"fw_manufacturer_id":4742,"model_id":"SNZB-02P"},{"fw_binary_url":"https://zigbee-ota.sonoff.tech/releases/snzb-02d_v2.3.0.ota","fw_file_version":8960,"fw_filesize":264118,"fw_image_type":2053,"fw_manufacturer_id":4742,"model_id":"SNZB-02D"}]
\ No newline at end of file
diff --git a/images/Sonoff/zbmini-l_v1.1.1.ota b/images/Sonoff/86-0001-00001101.zigbee
similarity index 100%
rename from images/Sonoff/zbmini-l_v1.1.1.ota
rename to images/Sonoff/86-0001-00001101.zigbee
diff --git a/images/Sonoff/snzb-06p_v1.0.5.ota b/images/Sonoff/snzb-06p_v1.0.5.ota
new file mode 100644
index 0000000..a66752c
Binary files /dev/null and b/images/Sonoff/snzb-06p_v1.0.5.ota differ
diff --git a/images/Sonoff/snzb-06p_v1.0.6.ota b/images/Sonoff/snzb-06p_v1.0.6.ota
deleted file mode 100644
index 19ae5ad..0000000
Binary files a/images/Sonoff/snzb-06p_v1.0.6.ota and /dev/null differ
diff --git a/images/Sonoff/snzb02lwd_v1.1.0.ota b/images/Sonoff/snzb02lwd_v1.1.0.ota
new file mode 100644
index 0000000..8fef087
Binary files /dev/null and b/images/Sonoff/snzb02lwd_v1.1.0.ota differ
diff --git a/images/Sonoff/zbminil2_v1.0.14.ota b/images/Sonoff/zigbeeminil2_100E_stand_ota_file.ota
similarity index 100%
rename from images/Sonoff/zbminil2_v1.0.14.ota
rename to images/Sonoff/zigbeeminil2_100E_stand_ota_file.ota
diff --git a/images1/Sonoff/zbminir2_v1.0.2.ota b/images1/Sonoff/zbminir2_v1.0.2.ota
new file mode 100644
index 0000000..62bb111
Binary files /dev/null and b/images1/Sonoff/zbminir2_v1.0.2.ota differ
diff --git a/images1/Sonoff/zbminir2_v1.0.4.ota b/images1/Sonoff/zbminir2_v1.0.4.ota
deleted file mode 100644
index 20d130c..0000000
Binary files a/images1/Sonoff/zbminir2_v1.0.4.ota and /dev/null differ
diff --git a/index.json b/index.json
index 275c800..d3185c1 100644
--- a/index.json
+++ b/index.json
@@ -4734,76 +4734,6 @@
     "sha512": "6a55736c9e858898bef68ad794c77290698227a3eb0db325f9cd750ae7a801ccd7780fd8282a60a7a40478c324e4e7c9b83e4b67cd85032926d80daaba93c1eb",
     "otaHeaderString": ""
   },
-  {
-    "fileName": "s40zbLite_v1.0.3.ota",
-    "fileVersion": 4099,
-    "fileSize": 156778,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/s40zbLite_v1.0.3.ota",
-    "imageType": 65,
-    "manufacturerCode": 4742,
-    "sha512": "38bc090584b844a0fe75900d6c0efb34a57d776b8d549fa3938cda437de4a454885f557a43ba51c7fa524f79de279a17c9da1d6c656c351f82b6eb46db1cf2b7",
-    "otaHeaderString": ""
-  },
-  {
-    "fileName": "snzb-05p_v1.0.2.ota",
-    "fileVersion": 4098,
-    "fileSize": 267632,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-05p_v1.0.2.ota",
-    "imageType": 2059,
-    "manufacturerCode": 4742,
-    "sha512": "bb64ae86d9ac2dc398d4520f97554515990ecef5568eebdaa7cdb2be19fe2471b35f53583adc8d8e9e70189a90add27556581bca444690155972ffa6b341b81e",
-    "otaHeaderString": "ota-file-test"
-  },
-  {
-    "fileName": "snzb-06p_v1.0.6.ota",
-    "fileVersion": 4102,
-    "fileSize": 258306,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-06p_v1.0.6.ota",
-    "imageType": 2060,
-    "manufacturerCode": 4742,
-    "sha512": "e722a7058439abba22f2d392f9308c0eb22dcb89ad32c3409983b74a28724713e9709cd2b6b61622dac57487227d2f902dd38291b9116a87b9fc52981669cf46",
-    "otaHeaderString": "vers: ZigBee:00001006"
-  },
-  {
-    "fileName": "zbmicro_v1.0.5.ota",
-    "fileVersion": 4101,
-    "fileSize": 269220,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbmicro_v1.0.5.ota",
-    "imageType": 7,
-    "manufacturerCode": 4742,
-    "sha512": "dd1d67ba721740c3eec4da80a2396c6fa09b981bcf2ed9fc712790e45ec9fb392d58d33e36a1bc19899a77a3421a206c1c9c2f7512ed3c8c571e1344f7d996d8",
-    "otaHeaderString": "ota-file-test"
-  },
-  {
-    "fileName": "zbmini-l_v1.1.1.ota",
-    "fileVersion": 4353,
-    "fileSize": 131086,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbmini-l_v1.1.1.ota",
-    "imageType": 1,
-    "manufacturerCode": 4742,
-    "sha512": "b136d2656ea1197ae84f5e9c2244a9d9697bccab2c448324d9176bac791aff0161afc73c8a1574bbd51c0ea2e318840ca58a0a99da32669d3e5fc776bdf3473a",
-    "otaHeaderString": ""
-  },
-  {
-    "fileName": "zbminil2_v1.0.14.ota",
-    "fileVersion": 4110,
-    "fileSize": 259018,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbminil2_v1.0.14.ota",
-    "imageType": 4,
-    "manufacturerCode": 4742,
-    "sha512": "c80d29e84e3019a84f7a3bdb3e84a3b462e2516c7de5120cdbb68a0e474fcb8b1c5d8eb79b204ad2d9c5af2bed4e544588b192b7884d493a11f82d4ac8625177",
-    "otaHeaderString": "ota-file-test"
-  },
-  {
-    "fileName": "zbswv_v1.0.4.ota",
-    "fileVersion": 4100,
-    "fileSize": 272354,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbswv_v1.0.4.ota",
-    "imageType": 8202,
-    "manufacturerCode": 4742,
-    "sha512": "49ef75a2d1dd6f706d2182d6cd88c6d98c0aa1e70fdb37e739e6e970266884579794faab361f976aed84c6f9c3c547f7d32f28940f16b72e3f7e454bd5001b1b",
-    "otaHeaderString": "ota-file-test"
-  },
   {
     "fileName": "wb_msw3_0_061.ota",
     "fileVersion": 61,
@@ -5554,16 +5484,6 @@
     "sha512": "f89ead312763061ca44dd3cd917c223087877ce235a2ac41ef22b31c43b6566baab267a3d90a649812364a7b4c065757fa4117b64fbed74857bae3d2493cbf27",
     "otaHeaderString": "LD6002B"
   },
-  {
-    "fileName": "snzb-02d_v2.3.0.ota",
-    "fileVersion": 8960,
-    "fileSize": 264118,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-02d_v2.3.0.ota",
-    "imageType": 2053,
-    "manufacturerCode": 4742,
-    "sha512": "1ff8bc7d3d38adc87b4b2050fc6241efdd989c6410b6a73f6f8dde999450f9468bc08ca62f7223adc61a2d655a746c257002af4c2c36f3c089c182cc4a58aaea",
-    "otaHeaderString": "FWSN_SNZB02D"
-  },
   {
     "fileName": "10F2-7B02-0002-0007-0192020D-spo-fms.ota1.zigbee",
     "fileVersion": 26345997,
@@ -5817,16 +5737,6 @@
     "sha512": "128de267c5c3ab0a1cff90ba0e19e8641674c27fde6c131bdd175eb86df5e2a07df60b610f974690d211350a79e08ca40f01e6dfbf6202548f03b9a933ec882f",
     "otaHeaderString": "Telink OTA Sample Usage"
   },
-  {
-    "fileName": "zbm5-120-zed_v1.0.4.ota",
-    "fileVersion": 4100,
-    "fileSize": 273908,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbm5-120-zed_v1.0.4.ota",
-    "imageType": 9,
-    "manufacturerCode": 4742,
-    "sha512": "a380068b7f4436d2930d37e6ddf63dddca1dd33dc9f5b6f05be36191c94b3c142735219985c26d1d3521a2216d9b95da44123ab0cab01ea1d77ec55e997de167",
-    "otaHeaderString": "ota-file-test"
-  },
   {
     "fileName": "1166-070d-30022162-fl122c-3.0.2.ota",
     "fileVersion": 805445986,
@@ -6628,16 +6538,6 @@
       "Slacky-DIY"
     ]
   },
-  {
-    "fileName": "snzb-02p_v2.2.0.ota",
-    "fileVersion": 8704,
-    "fileSize": 260018,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-02p_v2.2.0.ota",
-    "imageType": 2055,
-    "manufacturerCode": 4742,
-    "sha512": "4a8acf7ab76e2e193e816956c01ec8aebf34455b62240b3cefa856262cce760ca13b0010fa2570553dd6ce8a022ce534d2a6cb28384de34ef5c11f7020e1c8ff",
-    "otaHeaderString": "FWSN_SNZB02P"
-  },
   {
     "fileName": "1662545193-oem_zg_tl8258_plug_OTA_3.0.0.bin",
     "fileVersion": 192,
@@ -7258,16 +7158,6 @@
       "LiXee"
     ]
   },
-  {
-    "fileName": "mini-zb2gs_v1.0.4.ota",
-    "fileVersion": 4100,
-    "fileSize": 286032,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/mini-zb2gs_v1.0.4.ota",
-    "imageType": 68,
-    "manufacturerCode": 4742,
-    "sha512": "092b398fbdca07e7dd61bb580f130e304bdbcf895fcb2eda2324c166a412c75480ab4f9b323aae7627f80786c4dd94e897f490d768de6da84e406838c24cb01d",
-    "otaHeaderString": "ota-file-test"
-  },
   {
     "fileName": "128b-0002-030C-700_nodon_sin_4_2_20_fw_antenna_V030C.zigbee",
     "fileVersion": 780,
@@ -7703,16 +7593,6 @@
     "sha512": "c3e88377ac23f9eb87b316fd7c94bb07e20762421c638e1804c14f91b3f416c1da83a78e50d3d7b66b0bd0e606c01ad8527d94ffa680afbda104be0eadb6ef03",
     "otaHeaderString": "temp_humi_sensor"
   },
-  {
-    "fileName": "trvzb_v1.4.1.ota",
-    "fileVersion": 5121,
-    "fileSize": 332092,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/trvzb_v1.4.1.ota",
-    "imageType": 8199,
-    "manufacturerCode": 4742,
-    "sha512": "139a5f85f25bd2378ed110bd8698bfb31a8a4a9759dcf476a29677f550a274d3269c1b15abf477116b96e26eb407bd9424467b3a054d6f156de178bcd9f8a66f",
-    "otaHeaderString": "vers:00001401,00001208\n"
-  },
   {
     "fileName": "1021-000e-004e45ff-NLF.zigbee",
     "fileVersion": 5129727,
@@ -7793,16 +7673,6 @@
     "sha512": "440d4aa1a6984a5fb899019661db40ab9edf6f6d59f936d45a4cf670c677d64b1ad6fc2f7639f72274f1bd4d62c2150d9365c6d05ea7d80f6c4b6cbaa55b28e5",
     "otaHeaderString": "Telink OTA Sample Usage"
   },
-  {
-    "fileName": "zbminir2_v1.0.8.ota",
-    "fileVersion": 4104,
-    "fileSize": 277180,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbminir2_v1.0.8.ota",
-    "imageType": 8,
-    "manufacturerCode": 4742,
-    "sha512": "051912851dffed4b49d3caece8d67b0fec9987dcbdf4d6db45c4e23f4ea0c9be867491758af12f153bc9672d4205129a9270be79e781d150734be295c44971bf",
-    "otaHeaderString": "ota-file-test"
-  },
   {
     "fileName": "Bituo_ZS2S_signing_app14.ota",
     "fileVersion": 14,
@@ -8130,16 +8000,6 @@
     "sha512": "a25edda7c10d2268c18c276019157dc5b40b8e86af81b8c0564e542734f0123c0e0da1e48662215fe65373921f0b6bda1712f5999e90d77507e0829b95deafef",
     "otaHeaderString": "temp_humi_sensor"
   },
-  {
-    "fileName": "zbm5-120-zr_v1.0.6.ota",
-    "fileVersion": 4102,
-    "fileSize": 295168,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbm5-120-zr_v1.0.6.ota",
-    "imageType": 10,
-    "manufacturerCode": 4742,
-    "sha512": "a40601e64cdb0088ae8992ef396a3474e2f9cc5a8e5a9e992110401c1b36440fc272f8c2d7c8a2ba84d94de61f8065456274e465a9066e800bcc798c1049d4cd",
-    "otaHeaderString": "ota-file-test"
-  },
   {
     "fileName": "1135-0009-201000F8-FLS-CT_16Mhz.zigbee",
     "fileVersion": 537919736,
@@ -8180,17 +8040,6 @@
     "sha512": "d3a7f0f7d1fd5a414754b5c1d88a820fc7b1b800f6b353ff1cf903f87b3d0d07e8b4ba19324b3f643964b8e50207b32aa2a0fa89e589bdb1256c7b1cfb12a374",
     "otaHeaderString": "FLS-M Firmware 0x01010106"
   },
-  {
-    "fileName": "snzb-02dr2_v1.0.3.ota",
-    "fileVersion": 4099,
-    "fileSize": 212336,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-02dr2_v1.0.3.ota",
-    "imageType": 2064,
-    "manufacturerCode": 4742,
-    "customParseLogic": "telinkEncrypted",
-    "sha512": "9bd9f188c4b5e45878d72a6b513e9630f4fdc326d1d791d18c9d418971a6a6ad090f81e6e76a5fe800f213d735f116d95f704454212bea8823a13053c5e6a443",
-    "otaHeaderString": "FIRMWARE"
-  },
   {
     "fileName": "6565-0215-10083001-ts0201_tz3000_0x15_zed.zigbee",
     "fileVersion": 268972033,
@@ -9112,6 +8961,181 @@
     "otaHeaderString": "",
     "releaseNotes": "Version: 7.0"
   },
+  {
+    "fileName": "s40zbLite_v1.0.3.ota",
+    "fileVersion": 4099,
+    "fileSize": 156778,
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/s40zbLite_v1.0.3.ota",
+    "imageType": 65,
+    "manufacturerCode": 4742,
+    "sha512": "38bc090584b844a0fe75900d6c0efb34a57d776b8d549fa3938cda437de4a454885f557a43ba51c7fa524f79de279a17c9da1d6c656c351f82b6eb46db1cf2b7",
+    "otaHeaderString": ""
+  },
+  {
+    "fileName": "zbswv_v1.0.4.ota",
+    "fileVersion": 4100,
+    "fileSize": 272354,
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbswv_v1.0.4.ota",
+    "imageType": 8202,
+    "manufacturerCode": 4742,
+    "sha512": "49ef75a2d1dd6f706d2182d6cd88c6d98c0aa1e70fdb37e739e6e970266884579794faab361f976aed84c6f9c3c547f7d32f28940f16b72e3f7e454bd5001b1b",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "mini-zb2gs_v1.0.4.ota",
+    "fileVersion": 4100,
+    "fileSize": 286032,
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/mini-zb2gs_v1.0.4.ota",
+    "imageType": 68,
+    "manufacturerCode": 4742,
+    "sha512": "092b398fbdca07e7dd61bb580f130e304bdbcf895fcb2eda2324c166a412c75480ab4f9b323aae7627f80786c4dd94e897f490d768de6da84e406838c24cb01d",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "snzb-05p_v1.0.2.ota",
+    "fileVersion": 4098,
+    "fileSize": 267632,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/snzb-05p_v1.0.2.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-05p_v1.0.2.ota",
+    "imageType": 2059,
+    "manufacturerCode": 4742,
+    "sha512": "bb64ae86d9ac2dc398d4520f97554515990ecef5568eebdaa7cdb2be19fe2471b35f53583adc8d8e9e70189a90add27556581bca444690155972ffa6b341b81e",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "snzb-02dr2_v1.0.3.ota",
+    "fileVersion": 4099,
+    "fileSize": 212336,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/snzb-02dr2_v1.0.3.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-02dr2_v1.0.3.ota",
+    "imageType": 2064,
+    "manufacturerCode": 4742,
+    "sha512": "9bd9f188c4b5e45878d72a6b513e9630f4fdc326d1d791d18c9d418971a6a6ad090f81e6e76a5fe800f213d735f116d95f704454212bea8823a13053c5e6a443",
+    "otaHeaderString": "FIRMWARE",
+    "customParseLogic": "telinkEncrypted"
+  },
+  {
+    "fileName": "zbm5-120-zed_v1.0.4.ota",
+    "fileVersion": 4100,
+    "fileSize": 273908,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/zbm5-120-zed_v1.0.4.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbm5-120-zed_v1.0.4.ota",
+    "imageType": 9,
+    "manufacturerCode": 4742,
+    "sha512": "a380068b7f4436d2930d37e6ddf63dddca1dd33dc9f5b6f05be36191c94b3c142735219985c26d1d3521a2216d9b95da44123ab0cab01ea1d77ec55e997de167",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "snzb-06p_v1.0.5.ota",
+    "fileVersion": 4101,
+    "fileSize": 258206,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/snzb-06p_v1.0.5.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-06p_v1.0.5.ota",
+    "imageType": 2060,
+    "manufacturerCode": 4742,
+    "sha512": "fdcd4e238b25a971d79746a0305e185567e027c3ba08ed42ac7ca003601c25ccce497fd1f8e6ede1e0e7b058768bc2daf3ebc985174fc6265a9df4acc4f81467",
+    "otaHeaderString": "vers: ZigBee:00001005"
+  },
+  {
+    "fileName": "zbmicro_v1.0.5.ota",
+    "fileVersion": 4101,
+    "fileSize": 269220,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/zbmicro_v1.0.5.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbmicro_v1.0.5.ota",
+    "imageType": 7,
+    "manufacturerCode": 4742,
+    "sha512": "dd1d67ba721740c3eec4da80a2396c6fa09b981bcf2ed9fc712790e45ec9fb392d58d33e36a1bc19899a77a3421a206c1c9c2f7512ed3c8c571e1344f7d996d8",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "zbm5-120-zr_v1.0.6.ota",
+    "fileVersion": 4102,
+    "fileSize": 295168,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.6.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbm5-120-zr_v1.0.6.ota",
+    "imageType": 10,
+    "manufacturerCode": 4742,
+    "sha512": "a40601e64cdb0088ae8992ef396a3474e2f9cc5a8e5a9e992110401c1b36440fc272f8c2d7c8a2ba84d94de61f8065456274e465a9066e800bcc798c1049d4cd",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "zbminir2_v1.0.8.ota",
+    "fileVersion": 4104,
+    "fileSize": 277180,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/zbminir2_v1.0.8.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zbminir2_v1.0.8.ota",
+    "imageType": 8,
+    "manufacturerCode": 4742,
+    "sha512": "051912851dffed4b49d3caece8d67b0fec9987dcbdf4d6db45c4e23f4ea0c9be867491758af12f153bc9672d4205129a9270be79e781d150734be295c44971bf",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "zigbeeminil2_100E_stand_ota_file.ota",
+    "fileVersion": 4110,
+    "fileSize": 259018,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/zigbeeminil2_100E_stand_ota_file.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/zigbeeminil2_100E_stand_ota_file.ota",
+    "imageType": 4,
+    "manufacturerCode": 4742,
+    "sha512": "c80d29e84e3019a84f7a3bdb3e84a3b462e2516c7de5120cdbb68a0e474fcb8b1c5d8eb79b204ad2d9c5af2bed4e544588b192b7884d493a11f82d4ac8625177",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "snzb02lwd_v1.1.0.ota",
+    "fileVersion": 4352,
+    "fileSize": 167888,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/snzb02lwd_v1.1.0.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb02lwd_v1.1.0.ota",
+    "imageType": 2061,
+    "manufacturerCode": 4742,
+    "sha512": "d84f2e016626b25a5ada1171c920ae31fae57c77edfedc7959c8d2bb56af8c331d8b2bd71346afef7c68ff7672e816faa935262db78aad1b030c99f7bf865879",
+    "otaHeaderString": "Telink OTA Sample Usage",
+    "customParseLogic": "telinkEncrypted"
+  },
+  {
+    "fileName": "86-0001-00001101.zigbee",
+    "fileVersion": 4353,
+    "fileSize": 131086,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/86-0001-00001101.zigbee",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/86-0001-00001101.zigbee",
+    "imageType": 1,
+    "manufacturerCode": 4742,
+    "sha512": "b136d2656ea1197ae84f5e9c2244a9d9697bccab2c448324d9176bac791aff0161afc73c8a1574bbd51c0ea2e318840ca58a0a99da32669d3e5fc776bdf3473a",
+    "otaHeaderString": ""
+  },
+  {
+    "fileName": "trvzb_v1.4.1.ota",
+    "fileVersion": 5121,
+    "fileSize": 332092,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/trvzb_v1.4.1.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/trvzb_v1.4.1.ota",
+    "imageType": 8199,
+    "manufacturerCode": 4742,
+    "sha512": "139a5f85f25bd2378ed110bd8698bfb31a8a4a9759dcf476a29677f550a274d3269c1b15abf477116b96e26eb407bd9424467b3a054d6f156de178bcd9f8a66f",
+    "otaHeaderString": "vers:00001401,00001208\n"
+  },
+  {
+    "fileName": "snzb-02p_v2.2.0.ota",
+    "fileVersion": 8704,
+    "fileSize": 260018,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/snzb-02p_v2.2.0.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-02p_v2.2.0.ota",
+    "imageType": 2055,
+    "manufacturerCode": 4742,
+    "sha512": "4a8acf7ab76e2e193e816956c01ec8aebf34455b62240b3cefa856262cce760ca13b0010fa2570553dd6ce8a022ce534d2a6cb28384de34ef5c11f7020e1c8ff",
+    "otaHeaderString": "FWSN_SNZB02P"
+  },
+  {
+    "fileName": "snzb-02d_v2.3.0.ota",
+    "fileVersion": 8960,
+    "fileSize": 264118,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/snzb-02d_v2.3.0.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Sonoff/snzb-02d_v2.3.0.ota",
+    "imageType": 2053,
+    "manufacturerCode": 4742,
+    "sha512": "1ff8bc7d3d38adc87b4b2050fc6241efdd989c6410b6a73f6f8dde999450f9468bc08ca62f7223adc61a2d655a746c257002af4c2c36f3c089c182cc4a58aaea",
+    "otaHeaderString": "FWSN_SNZB02D"
+  },
   {
     "fileName": "snzb-01m_v1.0.5.ota",
     "fileVersion": 4101,
diff --git a/index1.json b/index1.json
index 4abbc42..006238c 100644
--- a/index1.json
+++ b/index1.json
@@ -2419,16 +2419,6 @@
     "sha512": "42541b4f77769aa9ea23fa62db5b22dd7dee3ff85e74b27634ac35b7ff639225e50a75713e73d36ecfeebbd5305ed013176a7f62bcde7bc65415c3b64d50fc3d",
     "otaHeaderString": "temp_humi_sensor"
   },
-  {
-    "fileName": "trvzb_v1.4.0.ota",
-    "fileVersion": 5120,
-    "fileSize": 332084,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Sonoff/trvzb_v1.4.0.ota",
-    "imageType": 8199,
-    "manufacturerCode": 4742,
-    "sha512": "c1001ffc0d3f38ac1b92e9d113e47ada6aa673671962eb03c11ecb7bc4ab5ea8a3f7c2d1d37095c7749a996c4eb381da0bb120be736d6757da6fa9e396f4522b",
-    "otaHeaderString": "vers:00001400,00001208\n"
-  },
   {
     "fileName": "1021-000e-004d45ff-NLF.zigbee",
     "fileVersion": 5064191,
@@ -2499,16 +2489,6 @@
     "sha512": "3f1424510f2f63ea177067706b962cd96258b7c854fa25cee63ec63d448942358231026222b3c29b4bc30ddc848ca1350ff1ff92c025a9a0100799e2d576dc99",
     "otaHeaderString": "Telink OTA Sample Usage"
   },
-  {
-    "fileName": "zbminir2_v1.0.4.ota",
-    "fileVersion": 4100,
-    "fileSize": 276694,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Sonoff/zbminir2_v1.0.4.ota",
-    "imageType": 8,
-    "manufacturerCode": 4742,
-    "sha512": "66b781d8aa2bf5f6cdae2679382bce99b73887f1588008c7d43b9a4ff5ba284463206354b4b8dc01b0a916887c05619350b73ae68c4d1db7a1c76afc1d9975f3",
-    "otaHeaderString": "ota-file-test"
-  },
   {
     "fileName": "1141-0201-01313001-ZMHOC401.zigbee",
     "fileVersion": 20000769,
@@ -2826,16 +2806,6 @@
     "sha512": "5245f6f61cc0e6179b7913bc2b485cd83e74e9b9eed02460609ce35638db9a41b20a21427ad1283c8932c98e042736e1cfd870c5b2aabc02cfcca3bd12606846",
     "otaHeaderString": "temp_humi_sensor"
   },
-  {
-    "fileName": "zbm5-120-zr_v1.0.4.ota",
-    "fileVersion": 4100,
-    "fileSize": 294932,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Sonoff/zbm5-120-zr_v1.0.4.ota",
-    "imageType": 10,
-    "manufacturerCode": 4742,
-    "sha512": "6825c846d11ba0c2a3f0819ced538f929ecbad0d9a182113d3de5f083c2435af657e8e9b5eb01318938e7914c07fa14c7cac462c87f068dd30e999712e9bd33b",
-    "otaHeaderString": "ota-file-test"
-  },
   {
     "fileName": "1135-0000-201000F5-FLS-PP3_RGBW_16Mhz.zigbee",
     "fileVersion": 537919733,
@@ -2991,5 +2961,38 @@
     "manufacturerCode": 4107,
     "sha512": "916714904a78a01074593aa8438ce7cfbe59a1166f3b0c87d72dc8dfcae5f7e0b57370effd6e5bc897f1a7d8d7b45a48fde68f4c22b7c8404077347f62e3a9d8",
     "otaHeaderString": ""
+  },
+  {
+    "fileName": "zbm5-120-zr_v1.0.4.ota",
+    "fileVersion": 4100,
+    "fileSize": 294932,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/zbm5-120-zr_v1.0.4.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Sonoff/zbm5-120-zr_v1.0.4.ota",
+    "imageType": 10,
+    "manufacturerCode": 4742,
+    "sha512": "6825c846d11ba0c2a3f0819ced538f929ecbad0d9a182113d3de5f083c2435af657e8e9b5eb01318938e7914c07fa14c7cac462c87f068dd30e999712e9bd33b",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "zbminir2_v1.0.2.ota",
+    "fileVersion": 4098,
+    "fileSize": 275788,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/zbminir2_v1.0.2.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Sonoff/zbminir2_v1.0.2.ota",
+    "imageType": 8,
+    "manufacturerCode": 4742,
+    "sha512": "b5c5a93ab84607292248e5262ccf0b8c250326d6ed5395c0d8818697b4286df5d85567a63bad7734a959bbaf58b83f9289ff027783284b11de5dfea8a48921ba",
+    "otaHeaderString": "ota-file-test"
+  },
+  {
+    "fileName": "trvzb_v1.4.0.ota",
+    "fileVersion": 5120,
+    "fileSize": 332084,
+    "originalUrl": "https://zigbee-ota.sonoff.tech/releases/trvzb_v1.4.0.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Sonoff/trvzb_v1.4.0.ota",
+    "imageType": 8199,
+    "manufacturerCode": 4742,
+    "sha512": "c1001ffc0d3f38ac1b92e9d113e47ada6aa673671962eb03c11ecb7bc4ab5ea8a3f7c2d1d37095c7749a996c4eb381da0bb120be736d6757da6fa9e396f4522b",
+    "otaHeaderString": "vers:00001400,00001208\n"
   }
 ]
\ No newline at end of file
diff --git a/package.json b/package.json
index b5f4588..aa47a01 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zigbee-ota",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/Koenkk/zigbee-OTA.git"
diff --git a/src/autodl/sonoff.ts b/src/autodl/sonoff.ts
new file mode 100644
index 0000000..74e3cf3
--- /dev/null
+++ b/src/autodl/sonoff.ts
@@ -0,0 +1,65 @@
+import {getJson, readCacheJson, writeCacheJson} from "../common.js";
+import {processFirmwareImage} from "../process_firmware_image.js";
+import type {ExtraMetas} from "../types.js";
+
+type DeviceImageJson = {
+    fw_binary_url: string;
+    fw_file_version: number;
+    fw_filesize: number;
+    fw_image_type: number;
+    fw_manufacturer_id: number;
+    model_id: string;
+};
+
+type ImagesJson = DeviceImageJson[];
+
+const NAME = "Sonoff";
+const LOG_PREFIX = `[${NAME}]`;
+const FIRMWARE_URL = "https://zigbee-ota.sonoff.tech/releases/upgrade.json";
+const TELINK_ENCRYPTED = ["SNZB-02DR2", "SNZB-02LWD"];
+
+function findInCache(image: DeviceImageJson, cachedData?: ImagesJson): DeviceImageJson | undefined {
+    return cachedData?.find((d) => d.fw_image_type === image.fw_image_type && d.fw_manufacturer_id === image.fw_manufacturer_id) as
+        | DeviceImageJson
+        | undefined;
+}
+
+function isDifferent(newData: DeviceImageJson, cachedData?: DeviceImageJson): boolean {
+    return Boolean(process.env.IGNORE_CACHE) || !cachedData || cachedData.fw_file_version !== newData.fw_file_version;
+}
+
+export async function writeCache(): Promise<void> {
+    const images = await getJson<ImagesJson>(NAME, FIRMWARE_URL);
+
+    if (images?.length) {
+        writeCacheJson(NAME, images);
+    }
+}
+
+export async function download(): Promise<void> {
+    const images = await getJson<ImagesJson>(NAME, FIRMWARE_URL);
+
+    if (images?.length) {
+        // make sure we process images in order of version (maintain proper base/prev)
+        images.sort((a, b) => a.fw_file_version - b.fw_file_version);
+
+        const cachedData = readCacheJson<ImagesJson>(NAME);
+
+        for (const image of images) {
+            const firmwareFileName = image.fw_binary_url.split("/").pop()!;
+
+            if (!isDifferent(image, findInCache(image, cachedData))) {
+                console.log(`[${NAME}:${firmwareFileName}] No change from last run.`);
+                continue;
+            }
+
+            const extraMetas: ExtraMetas = TELINK_ENCRYPTED.includes(image.model_id) ? {customParseLogic: "telinkEncrypted"} : {};
+
+            await processFirmwareImage(NAME, firmwareFileName, image.fw_binary_url, extraMetas);
+        }
+
+        writeCacheJson(NAME, images);
+    } else {
+        console.error(`${LOG_PREFIX} No image data.`);
+    }
+}
diff --git a/src/common.ts b/src/common.ts
index adc109f..9638701 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -38,6 +38,7 @@ export const ALL_AUTODL_MANUFACTURERS = [
     "ledvance",
     "lixee",
     "salus",
+    "sonoff",
     "ubisys",
     "xyzroe",
 ];