 #endif
 
 #ifdef HOME_ASSISTANT_MQTT_DISCOVERY
-  sprintf(HOME_ASSISTANT_MQTT_DISCOVERY_TOPIC,"%s/light/%s_%s",HOME_ASSISTANT_MQTT_DISCOVERY_PREFIX,chipid,arilux.getColorString());
+  sprintf(HOME_ASSISTANT_MQTT_DISCOVERY_TOPIC,"%s/light/ARILUX_%s_%s_%s",HOME_ASSISTANT_MQTT_DISCOVERY_PREFIX,DEVICE_MODEL,chipid,arilux.getColorString());
 #endif
 
   mqttClient.setServer(MQTT_SERVER, MQTT_PORT);

char friendlyName[32];
char configBuf[512];
StaticJsonBuffer<512> HOME_ASSISTANT_MQTT_DISCOVERY_CONFIG;
#define MQTT_MAX_PACKET_SIZE 768

volatile uint8_t cmd = ARILUX_CMD_NOT_DEFINED;



  sprintf(chipid, "%08X", ESP.getChipId());
  sprintf(MQTT_CLIENT_ID, HOST, chipid);
  sprintf(friendlyName, "Arilux %s %s LED Controller %s", DEVICE_MODEL, arilux.getColorString(), chipid);
  Serial.print("Hostname:");
  Serial.println(MQTT_CLIENT_ID);
  WiFi.hostname(MQTT_CLIENT_ID);
