diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h
index d1615135f..09ea8323a 100644
--- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h
+++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h
@@ -10,7 +10,7 @@
 #endif
 
 /* ESP8266 ESP32*/
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define SECRET_DEVICE_KEY "my-device-password"
 #endif
 
diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h
index f8d7bb506..fd4b2ce69 100644
--- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h
+++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h
@@ -7,7 +7,7 @@
   #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
 #endif
 
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 #endif
 
@@ -19,7 +19,7 @@ CloudLocation location;
 CloudColor color;
 
 void initProperties() {
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   ArduinoCloud.setBoardId(BOARD_ID);
   ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
 #endif
diff --git a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h
index d1615135f..09ea8323a 100644
--- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h
+++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h
@@ -10,7 +10,7 @@
 #endif
 
 /* ESP8266 ESP32*/
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define SECRET_DEVICE_KEY "my-device-password"
 #endif
 
diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h
index e11eaf81f..b10ac85fc 100644
--- a/examples/ArduinoIoTCloud-Basic/thingProperties.h
+++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h
@@ -7,7 +7,7 @@
   #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
 #endif
 
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 #endif
 
@@ -18,7 +18,7 @@ int potentiometer;
 int seconds;
 
 void initProperties() {
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   ArduinoCloud.setBoardId(BOARD_ID);
   ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
 #endif
diff --git a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h
index d1615135f..09ea8323a 100644
--- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h
+++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h
@@ -10,7 +10,7 @@
 #endif
 
 /* ESP8266 ESP32*/
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define SECRET_DEVICE_KEY "my-device-password"
 #endif
 
diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h
index d92788f98..f3de1a2ed 100644
--- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h
+++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h
@@ -7,12 +7,12 @@
   #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
 #endif
 
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 #endif
 
 void initProperties() {
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   ArduinoCloud.setBoardId(BOARD_ID);
   ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
 #endif
diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h
index d1615135f..09ea8323a 100644
--- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h
+++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h
@@ -10,7 +10,7 @@
 #endif
 
 /* ESP8266 ESP32*/
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define SECRET_DEVICE_KEY "my-device-password"
 #endif
 
diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h
index 94b3b0ece..1570e4a1b 100644
--- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h
+++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h
@@ -7,7 +7,7 @@
   #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
 #endif
 
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 #endif
 
@@ -16,7 +16,7 @@ void onLedChange();
 bool led;
 
 void initProperties() {
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   ArduinoCloud.setBoardId(BOARD_ID);
   ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
 #endif
diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h
index d1615135f..09ea8323a 100644
--- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h
+++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h
@@ -10,7 +10,7 @@
 #endif
 
 /* ESP8266 ESP32*/
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define SECRET_DEVICE_KEY "my-device-password"
 #endif
 
diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h
index 940cb5c26..22a185b9c 100644
--- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h
+++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h
@@ -7,7 +7,7 @@
   #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
 #endif
 
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 #endif
 
@@ -23,7 +23,7 @@ CloudSchedule monthly;
 CloudSchedule yearly;
 
 void initProperties() {
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   ArduinoCloud.setBoardId(BOARD_ID);
   ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
 #endif
diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h
index d1615135f..09ea8323a 100644
--- a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h
+++ b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h
@@ -10,7 +10,7 @@
 #endif
 
 /* ESP8266 ESP32*/
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define SECRET_DEVICE_KEY "my-device-password"
 #endif
 
diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h
index eff3035bd..8a9ed4a28 100644
--- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h
+++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h
@@ -11,7 +11,7 @@
    DEFINES
  ******************************************************************************/
 
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 #endif
 
@@ -79,7 +79,7 @@ void onStringPropertyChange();
  ******************************************************************************/
 #if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined (BOARD_HAS_NB)
 void initProperties() {
-#if defined(BOARD_ESP)
+#if defined(BOARD_HAS_SECRET_KEY)
   ArduinoCloud.setBoardId(BOARD_ID);
   ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
 #endif
diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h
index 95c886085..29bfb61f7 100644
--- a/src/AIoTC_Config.h
+++ b/src/AIoTC_Config.h
@@ -143,6 +143,7 @@
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
   #define BOARD_ESP
+  #define BOARD_HAS_SECRET_KEY
   #define HAS_TCP
 #endif
 
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
index 2e8b1bea8..11ffff1a2 100644
--- a/src/ArduinoIoTCloudTCP.cpp
+++ b/src/ArduinoIoTCloudTCP.cpp
@@ -86,7 +86,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
 #ifdef BOARD_HAS_ECCX08
 , _sslClient(nullptr, ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM, getTime)
 #endif
-  #ifdef BOARD_ESP
+  #ifdef BOARD_HAS_SECRET_KEY
 , _password("")
   #endif
 , _mqttClient{nullptr}
@@ -176,7 +176,7 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
 #endif
 
   _mqttClient.setClient(_sslClient);
-#ifdef BOARD_ESP
+#ifdef BOARD_HAS_SECRET_KEY
   _mqttClient.setUsernamePassword(getDeviceId(), _password);
 #endif
   _mqttClient.onMessage(ArduinoIoTCloudTCP::onMessage);
diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h
index 54b0d34f4..4b4a186cc 100644
--- a/src/ArduinoIoTCloudTCP.h
+++ b/src/ArduinoIoTCloudTCP.h
@@ -84,7 +84,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     #endif
     int begin(bool const enable_watchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
 
-    #ifdef BOARD_ESP
+    #ifdef BOARD_HAS_SECRET_KEY
     inline void setBoardId        (String const device_id) { setDeviceId(device_id); }
     inline void setSecretDeviceKey(String const password)  { _password = password;  }
     #endif
@@ -148,7 +148,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     CryptoUtil _crypto;
     #elif defined(BOARD_ESP)
     WiFiClientSecure _sslClient;
-    String _password;
     #elif defined(ARDUINO_PORTENTA_C33)
     ArduinoIoTCloudCertClass _cert;
     SSLClient _sslClient;
@@ -159,6 +158,10 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     CryptoUtil _crypto;
     #endif
 
+    #if defined (BOARD_HAS_SECRET_KEY)
+    String _password;
+    #endif
+
     MqttClient _mqttClient;
 
     String _deviceTopicOut;