diff --git a/README.md b/README.md
index 4fd1492..c11ed5d 100755
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ Supported boards are:
 | Board                                        | Platform      | Framework   | Transports                               | Default meta file        |
 | -------------------------------------------- | ------------- | ----------- | ---------------------------------------- | ------------------------ |
 | `portenta_h7_m7`                             | `ststm32`     | `arduino`   | `serial` <br/> `wifi`                    | `colcon.meta`            |
+| `giga_r1_m7`                                 | `ststm32`     | `arduino`   | `serial` <br/> `wifi`                    | `colcon.meta`            |
 | `teensy41`                                   | `teensy`      | `arduino`   | `serial` <br/> `native_ethernet`         | `colcon.meta`            |
 | `teensy40`                                   | `teensy`      | `arduino`   | `serial`                                 | `colcon.meta`            |
 | `teensy36` <br/> `teensy35` <br/> `teensy31` | `teensy`      | `arduino`   | `serial`                                 | `colcon_lowmem.meta`     |
diff --git a/extra_script.py b/extra_script.py
index d6b029f..30a4654 100644
--- a/extra_script.py
+++ b/extra_script.py
@@ -10,6 +10,7 @@
 
 boards_metas = {
     "portenta_h7_m7" : "colcon.meta",
+    "giga_r1_m7": "colcon.meta",
     "nanorp2040connect" : "colcon_verylowmem.meta",
     "teensy41" : "colcon.meta",
     "teensy40" : "colcon.meta",
@@ -117,7 +118,7 @@ def build_microros(*args, **kwargs):
     #######################################################
 
     # Add library
-    if (board == "portenta_h7_m7" or board == "nanorp2040connect" or board == "pico"):
+    if (board == "portenta_h7_m7" or board == "giga_r1_m7" or board == "nanorp2040connect" or board == "pico"):
         # Workaround for including the library in the linker group
         #   This solves a problem with duplicated symbols in Galactic
         global_env["_LIBFLAGS"] = "-Wl,--start-group " + global_env["_LIBFLAGS"] + " -l{} -Wl,--end-group".format(builder.library_name)