diff --git a/src/property/Property.cpp b/src/property/Property.cpp
index a26a7535c..18eff23b8 100644
--- a/src/property/Property.cpp
+++ b/src/property/Property.cpp
@@ -21,7 +21,7 @@
 #undef min
 #include <algorithm>
 
-#if !defined ARDUINO_ARCH_SAMD && !defined TARGET_PORTENTA_H7
+#if !defined ARDUINO_ARCH_SAMD && !defined ARDUINO_ARCH_MBED
   #pragma message "No RTC available on this architecture - ArduinoIoTCloud will not keep track of local change timestamps ."
 #endif
 
diff --git a/src/utility/time/TimeService.cpp b/src/utility/time/TimeService.cpp
index 32a20327c..dcd15f83b 100644
--- a/src/utility/time/TimeService.cpp
+++ b/src/utility/time/TimeService.cpp
@@ -51,7 +51,7 @@ static time_t const EPOCH_AT_COMPILE_TIME = cvt_time(__DATE__);
 
 TimeService::TimeService()
 : _con_hdl(nullptr)
-#if defined (ARDUINO_ARCH_SAMD) || defined (TARGET_PORTENTA_H7)
+#if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
 , _is_rtc_configured(false)
 #endif
 {
@@ -79,7 +79,7 @@ unsigned long TimeService::getTime()
     _is_rtc_configured = true;
   }
   return rtc.getEpoch();
-#elif TARGET_PORTENTA_H7
+#elif ARDUINO_ARCH_MBED
   if(!_is_rtc_configured)
   {
     set_time(getRemoteTime());
diff --git a/src/utility/time/TimeService.h b/src/utility/time/TimeService.h
index cc200c813..ae8c12f35 100644
--- a/src/utility/time/TimeService.h
+++ b/src/utility/time/TimeService.h
@@ -28,7 +28,7 @@
   #include <RTCZero.h>
 #endif
 
-#ifdef TARGET_PORTENTA_H7
+#ifdef ARDUINO_ARCH_MBED
   #include <mbed_rtc_time.h>
 #endif
 
@@ -50,7 +50,7 @@ class TimeService
 private:
 
   ConnectionHandler * _con_hdl;
-#if defined (ARDUINO_ARCH_SAMD) || defined (TARGET_PORTENTA_H7)
+#if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
   bool _is_rtc_configured;
 #endif