diff --git a/.github/workflows/build.addonbase.yaml b/.github/workflows/build.addonbase.yaml
index 7a9bb4f..1bda705 100644
--- a/.github/workflows/build.addonbase.yaml
+++ b/.github/workflows/build.addonbase.yaml
@@ -36,7 +36,7 @@ jobs:
             --platform linux/arm,linux/arm64,linux/amd64 \
             --output "type=image,push=true" \
             --no-cache \
-            --file ./addon_base/Dockerfile . \
+            --file ./addon_base/Dockerfile8 . \
             --compress \
-            --tag "netdaemon/netdaemon_addonbase" \
-            --tag "ghcr.io/net-daemon/netdaemon_addonbase"
+            --tag "netdaemon/netdaemon_addonbase:8" \
+            --tag "ghcr.io/net-daemon/netdaemon_addonbase:8"
diff --git a/.github/workflows/build.addonbase7.yaml b/.github/workflows/build.addonbase7.yaml
index e51ca9e..9720a6a 100644
--- a/.github/workflows/build.addonbase7.yaml
+++ b/.github/workflows/build.addonbase7.yaml
@@ -1,11 +1,11 @@
 #### Publish tags to docker hub
-name: 📦 Deploy to netdaemon_addonbase_7
+name: 📦 Deploy to netdaemon_addonbase:7
 on:
   workflow_dispatch:
 
 jobs:
   deploy:
-    name: 📦 Deploy to netdaemon_base_7
+    name: 📦 Deploy to netdaemon_base:7
     runs-on: ubuntu-latest
     environment: CI - release environment
     steps:
@@ -38,5 +38,5 @@ jobs:
             --no-cache \
             --file ./addon_base/Dockerfile7 . \
             --compress \
-            --tag "netdaemon/netdaemon_addonbase7" \
-            --tag "ghcr.io/net-daemon/netdaemon_addonbase7"
+            --tag "netdaemon/netdaemon_addonbase:7" \
+            --tag "ghcr.io/net-daemon/netdaemon_addonbase:7"
diff --git a/.github/workflows/build.base.yaml b/.github/workflows/build.base.yaml
index d72d6c4..71fe49e 100644
--- a/.github/workflows/build.base.yaml
+++ b/.github/workflows/build.base.yaml
@@ -36,7 +36,7 @@ jobs:
             --platform linux/arm,linux/arm64,linux/amd64 \
             --output "type=image,push=true" \
             --no-cache \
-            --file ./base/Dockerfile . \
+            --file ./base/Dockerfile8 . \
             --compress \
-            --tag "netdaemon/netdaemon_base" \
-            --tag "ghcr.io/net-daemon/netdaemon_base"
+            --tag "netdaemon/netdaemon_base:8" \
+            --tag "ghcr.io/net-daemon/netdaemon_base:8"
diff --git a/.github/workflows/build.base7.yaml b/.github/workflows/build.base7.yaml
index a167080..0ac8bd1 100644
--- a/.github/workflows/build.base7.yaml
+++ b/.github/workflows/build.base7.yaml
@@ -38,5 +38,5 @@ jobs:
             --no-cache \
             --file ./base/Dockerfile7 . \
             --compress \
-            --tag "netdaemon/netdaemon_base7" \
-            --tag "ghcr.io/net-daemon/netdaemon_base7"
+            --tag "netdaemon/netdaemon_base:7" \
+            --tag "ghcr.io/net-daemon/netdaemon_base:7"
diff --git a/addon_base/Dockerfile8 b/addon_base/Dockerfile8
new file mode 100644
index 0000000..256c7ec
--- /dev/null
+++ b/addon_base/Dockerfile8
@@ -0,0 +1,13 @@
+
+FROM ghcr.io/net-daemon/netdaemon_base:8
+
+RUN mkdir -p /usr/src/bashio \
+    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v0.14.3.tar.gz" \
+    | tar -xzf - --strip 1 -C /usr/src/bashio \
+    && mv /usr/src/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio
+
+LABEL \
+    io.hass.version="VERSION" \
+    io.hass.type="addon" \
+    io.hass.arch="armhf|aarch64|amd64"
diff --git a/base/Dockerfile8 b/base/Dockerfile8
new file mode 100644
index 0000000..4441b46
--- /dev/null
+++ b/base/Dockerfile8
@@ -0,0 +1,25 @@
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0
+
+ENV \
+    S6_KEEP_ENV=1 \
+    DOTNET_NOLOGO=true \
+    DOTNET_CLI_TELEMETRY_OPTOUT=true \
+    ASPNETCORE_URLS=http://+:5000
+
+# This one is used by the container to start custom assembly
+#NETDAEMON__APPLICATION_ASSEMBLY="" 
+
+# Install S6 and the Admin site
+RUN apt update && apt install -y \
+    nodejs \
+    yarn \
+    jq \
+    make
+
+COPY ./base/s6.sh /s6.sh
+
+RUN chmod 700 /s6.sh
+RUN /s6.sh
+
+ENTRYPOINT ["/init"]