diff --git a/README.md b/README.md
index 03ce3bd..0804734 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 :floppy_disk: `Arduino_OPC_UA`
 ==============================
-[![Compile Examples](https://github.com/bcmi-labs/Arduino_OPC_UA/workflows/Compile%20Examples/badge.svg)](https://github.com/bcmi-labs/Arduino_OPC_UA/actions?workflow=Compile+Examples)
-[![Arduino Lint](https://github.com/bcmi-labs/Arduino_OPC_UA/actions/workflows/arduino-lint.yml/badge.svg)](https://github.com/bcmi-labs/Arduino_OPC_UA/actions/workflows/arduino-lint.yml)
-[![Sync Labels status](https://github.com/bcmi-labs/Arduino_OPC_UA/actions/workflows/sync-labels.yml/badge.svg)](https://github.com/bcmi-labs/Arduino_OPC_UA/actions/workflows/sync-labels.yml)
+[![Compile Examples](https://github.com/arduino-libraries/Arduino_OPC_UA/workflows/Compile%20Examples/badge.svg)](https://github.com/arduino-libraries/Arduino_OPC_UA/actions?workflow=Compile+Examples)
+[![Arduino Lint](https://github.com/arduino-libraries/Arduino_OPC_UA/actions/workflows/arduino-lint.yml/badge.svg)](https://github.com/arduino-libraries/Arduino_OPC_UA/actions/workflows/arduino-lint.yml)
+[![Sync Labels status](https://github.com/arduino-libraries/Arduino_OPC_UA/actions/workflows/sync-labels.yml/badge.svg)](https://github.com/arduino-libraries/Arduino_OPC_UA/actions/workflows/sync-labels.yml)
 
 This library provides an implementation of [OPC UA](https://en.wikipedia.org/wiki/OPC_Unified_Architecture) by porting the Fraunhofer [`open62541`](https://github.com/open62541/open62541) for the Arduino [Opta](https://www.arduino.cc/pro/hardware-arduino-opta/) `microPLC` family.
 
@@ -31,7 +31,7 @@ $ cat /dev/ttyACM0
 [2024-06-21 02:30:19.000 (UTC+0000)] info/server	New DiscoveryUrl added: opc.tcp://192.168.8.137:4840
 ```
 * Connect to OPC UA server using IP/port as printed by the Arduino Opta
-![image](https://github.com/bcmi-labs/Arduino_OPC_UA/assets/3931733/ac153e79-6648-4808-9c4f-17aaf4305d89)
+![image](https://github.com/arduino-libraries/Arduino_OPC_UA/assets/3931733/ac153e79-6648-4808-9c4f-17aaf4305d89)
 
 ### How-to-`opcua-client-gui`
 ```bash
diff --git a/library.properties b/library.properties
index f2d7087..7a4774a 100644
--- a/library.properties
+++ b/library.properties
@@ -6,7 +6,7 @@ sentence=Arduino port of the open62541 providing OPC UA for Arduino Opta.
 paragraph=This library is an Arduino port of open62541, an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language.
 category=Communication
 architectures=mbed_opta
-url=https://github.com/bcmi-labs/Arduino_OPC_UA
+url=https://github.com/arduino-libraries/Arduino_OPC_UA
 ldflags=-lopen62541
 includes=Arduino_OPC_UA.h
 precompiled=true