diff --git a/nspanel-lovelace-ui/Dockerfile b/nspanel-lovelace-ui/Dockerfile
index 5bf6895c..a722015a 100644
--- a/nspanel-lovelace-ui/Dockerfile
+++ b/nspanel-lovelace-ui/Dockerfile
@@ -2,27 +2,8 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
-# Set shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# Copy Python requirements file
-COPY requirements.txt /tmp/
-
-# Setup base
-# hadolint ignore=DL3003,DL3042
-RUN \
-    apk add --no-cache --virtual .build-dependencies \
-    build-base=0.5-r3 \
-    python3-dev=3.11.6-r0 \
-    \
-    && apk add --no-cache \
-    py3-pip=23.1.2-r0 \
-    py3-wheel=0.40.0-r1 \
-    python3=3.11.6-r0 \
-    \
-    && pip install -r /tmp/requirements.txt \
-    \
-    && apk del --no-cache --purge .build-dependencies
+COPY rootfs/usr/bin/mqtt-manager/requirements.txt /tmp/
+RUN pip install -r /tmp/requirements.txt
 
 # Copy root filesystem
 COPY rootfs /
diff --git a/nspanel-lovelace-ui/build.yaml b/nspanel-lovelace-ui/build.yaml
index cdca3163..6aae23dd 100644
--- a/nspanel-lovelace-ui/build.yaml
+++ b/nspanel-lovelace-ui/build.yaml
@@ -1,14 +1,11 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
 build_from:
-  aarch64: "ghcr.io/home-assistant/aarch64-base:3.15"
-  amd64: "ghcr.io/home-assistant/amd64-base:3.15"
-  armhf: "ghcr.io/home-assistant/armhf-base:3.15"
-  armv7: "ghcr.io/home-assistant/armv7-base:3.15"
-  i386: "ghcr.io/home-assistant/i386-base:3.15"
+  aarch64: "ghcr.io/hassio-addons/base-python/aarch64:12.0.2"
+  amd64: "ghcr.io/hassio-addons/base-python/amd64:12.0.2"
+  armhf: "ghcr.io/hassio-addons/base-python/armhf:12.0.2"
+  armv7: "ghcr.io/hassio-addons/base-python/armv7:12.0.2"
+  i386: "ghcr.io/hassio-addons/base-python/i386:12.0.2"
 labels:
-  org.opencontainers.image.title: "Home Assistant Add-on: Example add-on"
-  org.opencontainers.image.description: "Example add-on to use as a blueprint for new add-ons."
-  org.opencontainers.image.source: "https://github.com/home-assistant/addons-example"
-  org.opencontainers.image.licenses: "Apache License 2.0"
-args:
-  TEMPIO_VERSION: "2021.09.0"
+  org.opencontainers.image.title: "Home Assistant Add-on: NSPanel Lovelace UI"
+  org.opencontainers.image.description: ""
+  org.opencontainers.image.source: "https://github.com/joBr99/nspanel-lovelace-ui"
diff --git a/nspanel-lovelace-ui/config.yaml b/nspanel-lovelace-ui/config.yaml
index 97818001..90ecd6e7 100644
--- a/nspanel-lovelace-ui/config.yaml
+++ b/nspanel-lovelace-ui/config.yaml
@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: NSPanel Lovelace UI Addon
-version: "4.7.3"
+version: "4.7.4"
 slug: nspanel-lovelace-ui
 description: NSPanel Lovelace UI Addon
 url: "https://github.com/joBr99/nspanel-lovelace-ui/tree/main/nspanel-lovelace-ui"
@@ -17,4 +17,4 @@ options:
   message: "Hello world..."
 schema:
   message: "str?"
-image: "ghcr.io/jobr99/{arch}-nspanel-lovelace-ui"
+#image: "ghcr.io/jobr99/{arch}-nspanel-lovelace-ui"
diff --git a/nspanel-lovelace-ui/requirements.txt b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/requirements.txt
similarity index 100%
rename from nspanel-lovelace-ui/requirements.txt
rename to nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/requirements.txt