diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h
index a34793180..d7a1bf8f0 100644
--- a/src/AIoTC_Config.h
+++ b/src/AIoTC_Config.h
@@ -142,21 +142,24 @@
  * CONSTANTS
  ******************************************************************************/
 
-#define AIOT_CONFIG_INTERVAL_RETRY_DELAY_ms                       (10000UL)
-#define AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms                    (1000UL)
-#define AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms               (32000UL)
-#define AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms          (2000UL)
-#define AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms     (32000UL)
-#define AIOT_CONFIG_DEVICE_TOPIC_MAX_RETRY_CNT                       (10UL)
-#define AIOT_CONFIG_DEVICE_TOPIC_ATTACH_RETRY_DELAY_ms            (20000UL)
-#define AIOT_CONFIG_MAX_DEVICE_TOPIC_ATTACH_RETRY_DELAY_ms      (1280000UL)
-#define AIOT_CONFIG_THING_TOPICS_SUBSCRIBE_RETRY_DELAY_ms          (1000UL)
-#define AIOT_CONFIG_THING_TOPICS_SUBSCRIBE_MAX_RETRY_CNT             (10UL)
-#define AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms                (30000UL)
-#define AIOT_CONFIG_LASTVALUES_SYNC_MAX_RETRY_CNT                    (10UL)
-
-#define AIOT_CONFIG_RP2040_OTA_HTTP_HEADER_RECEIVE_TIMEOUT_ms   (10*1000UL)
-#define AIOT_CONFIG_RP2040_OTA_HTTP_DATA_RECEIVE_TIMEOUT_ms   (4*60*1000UL)
+#if defined(HAS_LORA)
+  #define AIOT_CONFIG_LPWAN_UPDATE_RETRY_DELAY_ms                 (10000UL)
+#endif
+
+#if defined(HAS_TCP)
+  #define AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms                  (1000UL)
+  #define AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms             (32000UL)
+
+  #define AIOT_CONFIG_THING_ID_REQUEST_RETRY_DELAY_ms              (2000UL)
+  #define AIOT_CONFIG_MAX_THING_ID_REQUEST_RETRY_DELAY_ms         (32000UL)
+  #define AIOT_CONFIG_THING_ID_REQUEST_MAX_RETRY_CNT                 (10UL)
+
+  #define AIOT_CONFIG_DEVICE_REGISTERED_RETRY_DELAY_k                (10UL)
+  #define AIOT_CONFIG_MAX_DEVICE_REGISTERED_RETRY_DELAY_k             (4UL)
+
+  #define AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms              (30000UL)
+  #define AIOT_CONFIG_LASTVALUES_SYNC_MAX_RETRY_CNT                  (10UL)
+#endif
 
 #define AIOT_CONFIG_LIB_VERSION "2.0.3"
 
diff --git a/src/ArduinoIoTCloudDevice.cpp b/src/ArduinoIoTCloudDevice.cpp
index 53fcb74d5..3e67fda10 100644
--- a/src/ArduinoIoTCloudDevice.cpp
+++ b/src/ArduinoIoTCloudDevice.cpp
@@ -33,8 +33,8 @@ _registered(false) {
 }
 
 void ArduinoCloudDevice::begin() {
-  _attachAttempt.begin(AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms,
-                       AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms);
+  _attachAttempt.begin(AIOT_CONFIG_THING_ID_REQUEST_RETRY_DELAY_ms,
+                       AIOT_CONFIG_MAX_THING_ID_REQUEST_RETRY_DELAY_ms);
 }
 
 void ArduinoCloudDevice::update() {
@@ -93,8 +93,8 @@ void ArduinoCloudDevice::handleMessage(Message *m) {
 
 ArduinoCloudDevice::State ArduinoCloudDevice::handleInit() {
   /* Reset attempt struct for the nex retry after disconnection */
-  _attachAttempt.begin(AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms,
-                       AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms);
+  _attachAttempt.begin(AIOT_CONFIG_THING_ID_REQUEST_RETRY_DELAY_ms,
+                       AIOT_CONFIG_MAX_THING_ID_REQUEST_RETRY_DELAY_ms);
 
   _attached = false;
   _registered = false;
@@ -120,7 +120,7 @@ ArduinoCloudDevice::State ArduinoCloudDevice::handleSendCapabilities() {
 
 ArduinoCloudDevice::State ArduinoCloudDevice::handleConnected() {
   /* Max retry than disconnect */
-  if (_attachAttempt.getRetryCount() > AIOT_CONFIG_DEVICE_TOPIC_MAX_RETRY_CNT) {
+  if (_attachAttempt.getRetryCount() > AIOT_CONFIG_THING_ID_REQUEST_MAX_RETRY_CNT) {
     return State::Disconnected;
   }
 
@@ -130,8 +130,10 @@ ArduinoCloudDevice::State ArduinoCloudDevice::handleConnected() {
        * counter, but recompute delay.
        * Wait: 4s -> 80s -> 160s -> 320s -> 640s -> 1280s -> 1280s ...
        */
-      _attachAttempt.reconfigure(AIOT_CONFIG_DEVICE_TOPIC_ATTACH_RETRY_DELAY_ms,
-                                 AIOT_CONFIG_MAX_DEVICE_TOPIC_ATTACH_RETRY_DELAY_ms);
+      _attachAttempt.reconfigure(AIOT_CONFIG_THING_ID_REQUEST_RETRY_DELAY_ms *
+                                 AIOT_CONFIG_DEVICE_REGISTERED_RETRY_DELAY_k,
+                                 AIOT_CONFIG_MAX_THING_ID_REQUEST_RETRY_DELAY_ms *
+                                 AIOT_CONFIG_MAX_DEVICE_REGISTERED_RETRY_DELAY_k);
     }
     return State::SendCapabilities;
   }
diff --git a/src/ArduinoIoTCloudLPWAN.cpp b/src/ArduinoIoTCloudLPWAN.cpp
index 0f213e0a5..3c6a74daf 100644
--- a/src/ArduinoIoTCloudLPWAN.cpp
+++ b/src/ArduinoIoTCloudLPWAN.cpp
@@ -50,7 +50,7 @@ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN()
 : _state{State::ConnectPhy}
 , _retryEnable{false}
 , _maxNumRetry{5}
-, _intervalRetry{AIOT_CONFIG_INTERVAL_RETRY_DELAY_ms}
+, _intervalRetry{AIOT_CONFIG_LPWAN_UPDATE_RETRY_DELAY_ms}
 , _thing_property_container()
 , _last_checked_property_index{0}
 {
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
index f2a1b6fc1..dcab5ae7d 100644
--- a/src/ArduinoIoTCloudTCP.cpp
+++ b/src/ArduinoIoTCloudTCP.cpp
@@ -284,9 +284,6 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
     /* Subscribe to message topic to receive commands */
     _mqttClient.subscribe(_messageTopicIn);
 
-    /* Reconfigure timers for next state */
-    _connection_attempt.begin(AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms, AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms);
-
     DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s connected to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
     return State::Connected;
   }