diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 16cc2005b..04957fe10 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -57,6 +57,8 @@ jobs:
             id: git_minima
           - fqbn: arduino-git:renesas:unor4wifi
             id: git_wifi
+          - fqbn: arduino-git:renesas:nanor4
+            id: git_nanor4
 
 
         # make board type-specific customizations to the matrix jobs
@@ -112,6 +114,10 @@ jobs:
               fqbn: "arduino-git:renesas:minima"
             additional-sketch-paths: |
               - libraries/OPAMP
+          - board:
+              fqbn: "arduino-git:renesas:nanor4"
+            additional-sketch-paths: |
+              - libraries/OPAMP
 
     steps:
       - name: Checkout repository
diff --git a/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp b/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp
index c53f44942..0953a8aeb 100644
--- a/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp
+++ b/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp
@@ -14,7 +14,7 @@
 
 #include "R7FA4M1_CAN.h"
 
-#if defined(ARDUINO_MINIMA) || defined(ARDUINO_UNOWIFIR4)
+#if defined(ARDUINO_MINIMA) || defined(ARDUINO_UNOWIFIR4) || defined(ARDUINO_NANO_R4)
 
 #include <IRQManager.h>
 
diff --git a/libraries/Arduino_CAN/src/R7FA4M1_CAN.h b/libraries/Arduino_CAN/src/R7FA4M1_CAN.h
index 235df871f..51c6a12d2 100644
--- a/libraries/Arduino_CAN/src/R7FA4M1_CAN.h
+++ b/libraries/Arduino_CAN/src/R7FA4M1_CAN.h
@@ -17,7 +17,7 @@
 
 #include <Arduino.h>
 
-#if defined(ARDUINO_MINIMA) || defined(ARDUINO_UNOWIFIR4)
+#if defined(ARDUINO_MINIMA) || defined(ARDUINO_UNOWIFIR4) || defined(ARDUINO_NANO_R4)
 
 #include "api/HardwareCAN.h"
 
diff --git a/libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h b/libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h
index 1edfa529a..5f6e867f4 100644
--- a/libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h
+++ b/libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h
@@ -10,8 +10,8 @@
 
 #pragma once
 
-#if !defined(ARDUINO_PORTENTA_C33) && !defined(ARDUINO_MINIMA) && !defined(ARDUINO_UNOWIFIR4)
-# error "FreeRTOS is currently only supported for the Portenta C33, Arduino Uno R4 Minima and Arduino Uno R4 WiFi."
+#if !defined(ARDUINO_PORTENTA_C33) && !defined(ARDUINO_MINIMA) && !defined(ARDUINO_UNOWIFIR4) && !defined(ARDUINO_NANO_R4)
+# error "FreeRTOS is currently only supported for the Portenta C33, Arduino Uno R4 Minima, Arduino Uno R4 WiF and Arduino Nano R4."
 #endif
 
 #ifdef __cplusplus
diff --git a/libraries/Arduino_FreeRTOS/src/FreeRTOSConfig.h b/libraries/Arduino_FreeRTOS/src/FreeRTOSConfig.h
index 6b2aad74d..9576cd9dd 100644
--- a/libraries/Arduino_FreeRTOS/src/FreeRTOSConfig.h
+++ b/libraries/Arduino_FreeRTOS/src/FreeRTOSConfig.h
@@ -119,7 +119,7 @@ FSP_HEADER
 #ifndef configTOTAL_HEAP_SIZE
 # if defined(ARDUINO_PORTENTA_C33)
 #   define configTOTAL_HEAP_SIZE (0x8000)
-# elif (defined(ARDUINO_MINIMA) || defined(ARDUINO_UNOWIFIR4))
+# elif (defined(ARDUINO_MINIMA) || defined(ARDUINO_UNOWIFIR4)) || defined(ARDUINO_NANO_R4)
 #   define configTOTAL_HEAP_SIZE (0x2000) /* R7FA4M1AB has 32 kByte RAM total, so we only allocate 8 kByte RAM for FreeRTOS heap. */
 # else
 #  error "Define the total allowed heap size dependent on your MCU's available RAM."
diff --git a/libraries/OPAMP/src/OPAMP.cpp b/libraries/OPAMP/src/OPAMP.cpp
index b55ba9248..b66f0dd86 100644
--- a/libraries/OPAMP/src/OPAMP.cpp
+++ b/libraries/OPAMP/src/OPAMP.cpp
@@ -2,7 +2,7 @@
 #include <Arduino.h>
 
 /* Make sure this library fails to compile for unsupported boards. */
-#if !defined(ARDUINO_UNOWIFIR4) && !defined(ARDUINO_MINIMA)
+#if !defined(ARDUINO_UNOWIFIR4) && !defined(ARDUINO_MINIMA) && !defined(ARDUINO_NANO_R4)
 #error "Unsupported board for OPAMP library."
 #endif