diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e69de29..4f91197 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+.github/* @minims
\ No newline at end of file
diff --git a/MyFox2MQTT-dev/Dockerfile b/MyFox2MQTT-dev/Dockerfile
index 8e4d467..d25ceb1 100644
--- a/MyFox2MQTT-dev/Dockerfile
+++ b/MyFox2MQTT-dev/Dockerfile
@@ -1,6 +1,7 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
 ARG BUILD_FROM
 FROM $BUILD_FROM
+FROM $BUILD_FROM$:dev
 ENV LANG C.UTF-8
 
 # Install required packages
diff --git a/MyFox2MQTT/Dockerfile b/MyFox2MQTT/Dockerfile
index 64c0d0f..32c7426 100644
--- a/MyFox2MQTT/Dockerfile
+++ b/MyFox2MQTT/Dockerfile
@@ -1,11 +1,9 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
+ARG VERSION=2024.9.2
 ARG BUILD_FROM
-FROM $BUILD_FROM
+FROM $BUILD_FROM:{$VERSION}
 ENV LANG C.UTF-8
 
-# MyFox2MQTT version
-ARG VERSION=2024.9.2
-
 # Install required packages
 RUN apk add --no-cache py3-pip
 RUN pip3 install --no-cache-dir python-json2yaml==0.1.1
diff --git a/SomfyProtect2MQTT-dev/Dockerfile b/SomfyProtect2MQTT-dev/Dockerfile
index 5dcb502..fad012a 100644
--- a/SomfyProtect2MQTT-dev/Dockerfile
+++ b/SomfyProtect2MQTT-dev/Dockerfile
@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
 ARG BUILD_FROM
-FROM ${BUILD_FROM}
+FROM ${BUILD_FROM}:dev
 ENV LANG C.UTF-8
 
 # Copy root filesystem
diff --git a/SomfyProtect2MQTT/Dockerfile b/SomfyProtect2MQTT/Dockerfile
index dd7d3cd..b018c8f 100644
--- a/SomfyProtect2MQTT/Dockerfile
+++ b/SomfyProtect2MQTT/Dockerfile
@@ -1,11 +1,9 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
+ARG VERSION=2024.9.0
 ARG BUILD_FROM
-FROM $BUILD_FROM
+FROM $BUILD_FROM$:${VERSION}
 ENV LANG C.UTF-8
 
-# SomfyProtect2MQTT version
-ARG VERSION=2024.9.0
-
 # Install required packages
 RUN apk add --no-cache py3-pip py3-opencv ffmpeg
 RUN pip3 install --no-cache-dir python-json2yaml==0.1.1