diff --git a/.github/arduino-ci/Dockerfile b/.github/arduino-ci/Dockerfile
index 41c127c..e7b7496 100644
--- a/.github/arduino-ci/Dockerfile
+++ b/.github/arduino-ci/Dockerfile
@@ -23,9 +23,9 @@ RUN arduino-cli core install arduino:megaavr
 RUN arduino-cli core install arduino:sam
 RUN arduino-cli core install arduino:samd
 RUN arduino-cli core install arduino:mbed_edge
+RUN arduino-cli core install arduino:mbed_giga
 RUN arduino-cli core install arduino:mbed_nano
 RUN arduino-cli core install arduino:mbed_nicla
-RUN arduino-cli core install arduino:mbed_opta
 RUN arduino-cli core install arduino:mbed_portenta
 RUN arduino-cli core install arduino:mbed_rp2040
 
diff --git a/.github/workflows/arduino-builds.yml b/.github/workflows/arduino-builds.yml
index 5bc3b64..e14f1e4 100644
--- a/.github/workflows/arduino-builds.yml
+++ b/.github/workflows/arduino-builds.yml
@@ -31,9 +31,9 @@ jobs:
           - arduino:sam:arduino_due_x
           - arduino:samd:tian
           - arduino:mbed_edge:edge_control
+          - arduino:mbed_giga:giga
           - arduino:mbed_nano:nano33ble
           - arduino:mbed_nicla:nicla_sense
-          - arduino:mbed_opta:opta
           - arduino:mbed_portenta:envie_m7
           - arduino:mbed_rp2040:pico
           - esp32:esp32:esp32
diff --git a/README.md b/README.md
index f73dbf2..baeb99b 100644
--- a/README.md
+++ b/README.md
@@ -193,7 +193,7 @@ While added the library shall be configured via Mbed native configuration (see
 * Arduino/Pico SDK RP2040.
     * Platform classes: `OneWireNg_PicoRP2040`, `OneWireNg_PicoRP2040PIO`.
     * Tested on Raspberry Pi Pico.
-* Arduino/Mbed OS based platforms (incl. Edge, Nano, Nicla, Portena, Opta, RP2040).
+* Arduino/Mbed OS based platforms (incl. Edge, Giga, Nano, Nicla, Portena, RP2040).
     * Platform class: `OneWireNg_ArduinoMbedHAL`.
     * Tested on Raspberry Pi Pico, Nucleo-144 (L552ZE-Q).
 * Arduino STM32.
diff --git a/library.properties b/library.properties
index 29320dc..b1a0fdf 100644
--- a/library.properties
+++ b/library.properties
@@ -6,4 +6,4 @@ sentence=Arduino 1-wire service library. OneWire alternative.
 paragraph=Written from scratch alternative for the classic Arduino OneWire library providing: (1) fixed handling of the 1-wire bus low-level activities related to its open-drain characteristic, (2) 1-wire touch support, (3) new I/O interface with enhanced parasite powering support, (4) advanced search filtering, (5) overdrive mode support, (6) Dallas thermometers driver, (7) OneWire compatibility interface, (8) improved overall software architecture.
 category=Communication
 url=https://github.com/pstolarz/OneWireNg
-architectures=avr,megaavr,esp8266,esp32,rp2040,sam,samd,samd_beta,stm32,mbed,mbed_edge,mbed_giga,mbed_nano,mbed_nicla,mbed_opta,mbed_portenta,mbed_rp2040
+architectures=avr,megaavr,esp8266,esp32,rp2040,sam,samd,samd_beta,stm32,mbed,mbed_edge,mbed_giga,mbed_nano,mbed_nicla,mbed_portenta,mbed_rp2040