diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index afe8a367..e6d883db 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -70,6 +70,8 @@ jobs:
             platform-name: arduino:mbed_giga
           - fqbn: arduino:renesas_portenta:portenta_c33
             platform-name: arduino:renesas_portenta
+          - fqbn: arduino:renesas_uno:unor4wifi
+            platform-name: arduino:renesas_uno
 
         # Make board type-specific customizations to the matrix jobs
         include:
@@ -91,6 +93,11 @@ jobs:
             platforms: |
               # Install Arduino Renesas portenta Boards via Boards Manager
               - name: arduino:renesas_portenta
+          - board:
+              platform-name: arduino:renesas_uno
+            platforms: |
+              # Install Arduino Renesas uno Boards via Boards Manager
+              - name: arduino:renesas_uno
           - board:
               platform-name: esp8266:esp8266
             platforms: |
diff --git a/library.properties b/library.properties
index 721f98ca..ad9e824f 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,mbed_opta,mbed_giga,renesas_portenta
+architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla,mbed_opta,mbed_giga,renesas_portenta,renesas_uno
 depends=Arduino_DebugUtils, WiFi101, WiFiNINA, MKRGSM, MKRNB, MKRWAN
diff --git a/src/Arduino_ConnectionHandler.h b/src/Arduino_ConnectionHandler.h
index e0dced4c..107c8ddd 100644
--- a/src/Arduino_ConnectionHandler.h
+++ b/src/Arduino_ConnectionHandler.h
@@ -147,6 +147,16 @@
   #define WIFI_FIRMWARE_VERSION_REQUIRED WIFI_FIRMWARE_REQUIRED
 #endif
 
+#if defined(ARDUINO_UNOR4_WIFI)
+  #include <WiFiS3.h>
+
+  #define BOARD_HAS_WIFI
+  #define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
+  #define NETWORK_IDLE_STATUS WL_IDLE_STATUS
+  #define NETWORK_CONNECTED WL_CONNECTED
+  #define WIFI_FIRMWARE_VERSION_REQUIRED WIFI_FIRMWARE_LATEST_VERSION
+#endif
+
 /******************************************************************************
    INCLUDES
  ******************************************************************************/