diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 25aaafbe..d3d07ac5 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -64,6 +64,8 @@ jobs:
             platform-name: arduino:mbed_nano
           - fqbn: arduino:mbed_nicla:nicla_vision
             platform-name: arduino:mbed_nicla
+          - fqbn: arduino:mbed_opta:opta
+            platform-name: arduino:mbed_opta
 
         # Make board type-specific customizations to the matrix jobs
         include:
diff --git a/library.properties b/library.properties
index 5e940190..3a69f452 100644
--- a/library.properties
+++ b/library.properties
@@ -6,5 +6,5 @@ sentence=Arduino Library for network connection management (WiFi, GSM, NB, [Ethe
 paragraph=Originally part of ArduinoIoTCloud
 category=Communication
 url=https://github.com/arduino-libraries/Arduino_ConnectionHandler
-architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla
+architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla,mbed_opta
 depends=Arduino_DebugUtils, WiFi101, WiFiNINA, MKRGSM, MKRNB, MKRWAN
diff --git a/src/Arduino_ConnectionHandler.h b/src/Arduino_ConnectionHandler.h
index 79758066..225f58ce 100644
--- a/src/Arduino_ConnectionHandler.h
+++ b/src/Arduino_ConnectionHandler.h
@@ -67,6 +67,19 @@
   #define NETWORK_CONNECTED WL_CONNECTED
 #endif
 
+#if defined(ARDUINO_OPTA)
+  #include <WiFi.h>
+  #include <WiFiUdp.h>
+  #include <Ethernet.h>
+  #include <PortentaEthernet.h>
+
+  #define BOARD_HAS_WIFI
+  #define BOARD_HAS_ETHERNET
+  #define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
+  #define NETWORK_IDLE_STATUS WL_IDLE_STATUS
+  #define NETWORK_CONNECTED WL_CONNECTED
+#endif
+
 #ifdef ARDUINO_SAMD_MKRGSM1400
   #include <MKRGSM.h>
   #define BOARD_HAS_GSM