diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h
index 45217eb6..b93ce67d 100644
--- a/src/AIoTC_Config.h
+++ b/src/AIoTC_Config.h
@@ -107,18 +107,14 @@
   #define BOARD_HAS_SECURE_ELEMENT
 #endif
 
-#endif // HAS_NOTECARD
-
 #if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
   #define OTA_STORAGE_SNU         (1)
 #else
   #define OTA_STORAGE_SNU         (0)
 #endif
 
-#if defined(ARDUINO_NANO_RP2040_CONNECT)
-  #define OTA_STORAGE_SFU         (1)
-#else
-  #define OTA_STORAGE_SFU         (0)
+#if defined(ARDUINO_UNOR4_WIFI)
+  #define OTA_STORAGE_ESP         (1)
 #endif
 
 #ifdef ARDUINO_SAMD_MKRGSM1400
@@ -127,13 +123,21 @@
   #define OTA_STORAGE_SSU         (0)
 #endif
 
+#endif // !defined(HAS_NOTECARD)
+
+#if defined(ARDUINO_NANO_RP2040_CONNECT)
+  #define OTA_STORAGE_SFU         (1)
+#else
+  #define OTA_STORAGE_SFU         (0)
+#endif
+
 #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_OPTA) || defined(ARDUINO_GIGA)
   #define OTA_STORAGE_PORTENTA_QSPI   (1)
 #else
   #define OTA_STORAGE_PORTENTA_QSPI   (0)
 #endif
 
-#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_UNOR4_WIFI)
+#if defined(ARDUINO_ARCH_ESP32)
   #define OTA_STORAGE_ESP         (1)
 #endif
 
diff --git a/src/ota/interface/OTAInterface.h b/src/ota/interface/OTAInterface.h
index 7aa2e12c..bd2d42b7 100644
--- a/src/ota/interface/OTAInterface.h
+++ b/src/ota/interface/OTAInterface.h
@@ -87,7 +87,6 @@ class OTACloudProcessInterface: public CloudProcess {
   virtual void handleMessage(Message*);
   // virtual CloudProcess::State getState();
   // virtual void hook(State s, void* action);
-  inline virtual void setConnection(ConnectionHandler * connection) { (void)connection; }
   virtual void update() { handleMessage(nullptr); }
 
   inline void approveOta()                      { policies |= Approved; }
diff --git a/src/ota/interface/OTAInterfaceNotecard.h b/src/ota/interface/OTAInterfaceNotecard.h
index dd4a2ddd..c4b3ce75 100644
--- a/src/ota/interface/OTAInterfaceNotecard.h
+++ b/src/ota/interface/OTAInterfaceNotecard.h
@@ -45,7 +45,7 @@ class OTADefaultCloudProcessInterface: public OTACloudProcessInterface {
     OTADefaultCloudProcessInterface(MessageStream *ms, Client* client=nullptr);
     virtual ~OTADefaultCloudProcessInterface();
 
-    inline virtual void setConnection(ConnectionHandler * connection) override { _connection = connection; }
+    inline void setConnection(ConnectionHandler * connection) { _connection = connection; }
 
   protected:
     virtual State startOTA() override;