diff --git a/tasmota/settings.h b/tasmota/settings.h
index fbfac2e42..75797696e 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -166,7 +166,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t pwm_force_same_phase : 1;     // bit 20 (v10.1.0.6) - SetOption134 - (PWM) force PWM lights to start at same phase, default is to spread phases to minimze overlap (also needed for H-bridge)
     uint32_t display_no_splash : 1;        // bit 21 (v11.0.0.2) - SetOption135 - (Display & LVGL) forece disbabling default splash screen
     uint32_t tuyasns_no_immediate : 1;     // bit 22 (v11.0.0.4) - SetOption136 - (TuyaSNS) When ON disable publish single SNS value on Tuya Receive (keep Teleperiod)
-    uint32_t tuya_exclude_heartbeat : 1;   // bit 23 (v11.0.0.5) - SetOption137 - (Tuya) When Set, avoid the (mqtt-) publish of Tuya MCU Heartbeat response if SetOption66 is active
+    uint32_t tuya_exclude_from_mqtt : 1;   // bit 23 (v11.0.0.5) - SetOption137 - (Tuya) When Set, avoid the (MQTT-) publish of defined Tuya CMDs (see xdrv_16_tuyamcu.ino) if SetOption66 is active
     uint32_t spare24 : 1;                  // bit 24
     uint32_t spare25 : 1;                  // bit 25
     uint32_t spare26 : 1;                  // bit 26
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 719918208..6f7e89783 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -1208,7 +1208,7 @@ void SettingsDefaultSet2(void) {
   // Tuya
   flag3.tuya_apply_o20 |= TUYA_SETOPTION_20;
   flag5.tuya_allow_dimmer_0 |= TUYA_ALLOW_DIMMER_0;
-  flag5.tuya_exclude_heartbeat |= TUYA_SETOPTION_137;
+  flag5.tuya_exclude_from_mqtt |= TUYA_SETOPTION_137;
   flag3.tuya_serial_mqtt_publish |= MQTT_TUYA_RECEIVED;
   mbflag2.temperature_set_res |= TUYA_TEMP_SET_RES;
 
diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index f80efcb4e..2774848b0 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -27,16 +27,18 @@
 #define TUYA_DIMMER_ID         0
 #endif
 
-#define TUYA_CMD_HEARTBEAT     0x00
-#define TUYA_CMD_QUERY_PRODUCT 0x01
-#define TUYA_CMD_MCU_CONF      0x02
-#define TUYA_CMD_WIFI_STATE    0x03
-#define TUYA_CMD_WIFI_RESET    0x04
-#define TUYA_CMD_WIFI_SELECT   0x05
-#define TUYA_CMD_SET_DP        0x06
-#define TUYA_CMD_STATE         0x07
-#define TUYA_CMD_QUERY_STATE   0x08
-#define TUYA_CMD_SET_TIME      0x1C
+#define TUYA_CMD_HEARTBEAT          0x00
+#define TUYA_CMD_QUERY_PRODUCT      0x01
+#define TUYA_CMD_MCU_CONF           0x02
+#define TUYA_CMD_WIFI_STATE         0x03
+#define TUYA_CMD_WIFI_RESET         0x04
+#define TUYA_CMD_WIFI_SELECT        0x05
+#define TUYA_CMD_SET_DP             0x06
+#define TUYA_CMD_STATE              0x07
+#define TUYA_CMD_QUERY_STATE        0x08
+#define TUYA_CMD_INITIATING_UPGRADE 0x0A
+#define TUYA_CMD_UPGRADE_PACKAGE    0x0B
+#define TUYA_CMD_SET_TIME           0x1C
 
 #define TUYA_LOW_POWER_CMD_WIFI_STATE   0x02
 #define TUYA_LOW_POWER_CMD_WIFI_RESET   0x03
@@ -110,6 +112,9 @@ void (* const TuyaCommand[])(void) PROGMEM = {
   &CmndTuyaMcu, &CmndTuyaSend, &CmndTuyaRgb, &CmndTuyaEnum, &CmndTuyaEnumList, &CmndTuyaTempSetRes
 };
 
+const uint8_t TuyaExcludeCMDsFromMQTT[] PROGMEM = // don't publish this received commands via MQTT if SetOption66 and SetOption137 is active (can be expanded in the future)
+  TUYA_CMD_HEARTBEAT, TUYA_CMD_SET_TIME, TUYA_CMD_UPGRADE_PACKAGE;
+
 /*********************************************************************************************\
  * Web Interface
 \*********************************************************************************************/
@@ -1243,7 +1248,7 @@ void TuyaSerialInput(void)
       uint8_t dpId = 0;
       uint8_t dpDataType = 0;
       char DataStr[15];
-      bool isHeartbeat = false;
+      bool isCmdToSuppress = false;
 
       if (len > 0) {
         ResponseAppend_P(PSTR(",\"CmndData\":\"%s\""), ToHex_P((unsigned char*)&Tuya.buffer[6], len, hex_char, sizeof(hex_char)));
@@ -1287,14 +1292,17 @@ void TuyaSerialInput(void)
             dpidStart += dpDataLen + 4;
           }
         }
-        else if (TUYA_CMD_HEARTBEAT == Tuya.buffer[3]) {
-          isHeartbeat = true;
-        }
       }
       ResponseAppend_P(PSTR("}}"));
 
       if (Settings->flag3.tuya_serial_mqtt_publish) {  // SetOption66 - Enable TuyaMcuReceived messages over Mqtt
-        if (!(isHeartbeat && Settings->flag5.tuya_exclude_heartbeat)) {  // SetOption137 - (Tuya) When Set, avoid the (mqtt-) publish of Tuya MCU Heartbeat response if SetOption66 is active
+        for (uint8_t cmdsID = 0; sizeof(TuyaExcludeCMDsFromMQTT) > cmdsID; cmdsID++){
+          if (TuyaExcludeCMDsFromMQTT[cmdsID] == Tuya.buffer[3]) {
+            isCmdToSuppress = true;
+            break;
+          }  
+        }
+        if (!(isCmdToSuppress && Settings->flag5.tuya_exclude_from_mqtt)) {  // SetOption137 - (Tuya) When Set, avoid the (MQTT-) publish of defined Tuya CMDs (see TuyaExcludeCMDsFromMQTT) if SetOption66 is active
           MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_TUYA_MCU_RECEIVED));
         }        
       } else {