diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..e2dde90
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*   @poblouin
\ No newline at end of file
diff --git a/package.json b/package.json
index d72ca60..32d04aa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Spotify Speaker",
   "name": "@poblouin/homebridge-spotify-speaker",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Homebridge plugin that creates a speaker that plays a specific Spotify playlist",
   "license": "MIT",
   "author": "Pierre-Olivier Blouin <poblouin@pm.me>",
diff --git a/src/platform.ts b/src/platform.ts
index 1348d08..535b111 100644
--- a/src/platform.ts
+++ b/src/platform.ts
@@ -63,7 +63,7 @@ export class HomebridgeSpotifySpeakerPlatform implements DynamicPlatformPlugin {
         continue;
       }
 
-      const uuid = this.api.hap.uuid.generate(device.spotifyDeviceId);
+      const uuid = this.api.hap.uuid.generate(`${device.deviceName}-${device.spotifyDeviceId}`);
       const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
 
       if (existingAccessory) {