diff --git a/vhclient/Dockerfile b/vhclient/Dockerfile
index 8d602a7..c686cb7 100644
--- a/vhclient/Dockerfile
+++ b/vhclient/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base-python/amd64:6.0.3
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:16.3.6
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -9,13 +9,25 @@ COPY rootfs /
 COPY requirements.txt /tmp/
 
 # Setup base
-ARG BUILD_ARCH=amd64
 RUN \
-    pip3 install \
-    --no-cache-dir \
-    --prefer-binary \
-    --find-links "https://wheels.home-assistant.io/alpine-3.13/${BUILD_ARCH}/" \
-    -r /tmp/requirements.txt
+    apk add --no-cache --virtual .build-dependencies \
+        build-base=0.5-r3 \
+        py3-pip=24.0-r2 \
+        python3-dev=3.12.7-r0 \
+    \
+    && apk add --no-cache \
+        py3-packaging=24.0-r1 \
+        py3-six=1.16.0-r9 \
+        python3=3.12.7-r0 \
+    \
+    && pip3 install -r /tmp/requirements.txt \
+    \
+    && find /usr/local \
+        \( -type d -a -name test -o -name tests -o -name '__pycache__' \) \
+        -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
+        -exec rm -rf '{}' + \
+    \
+    && apk del --no-cache --purge .build-dependencies
 
 #RUN \
 #    curl -sSLf -o initool.zip \
diff --git a/vhclient/config.yaml b/vhclient/config.yaml
index 9964faf..a6f0759 100644
--- a/vhclient/config.yaml
+++ b/vhclient/config.yaml
@@ -1,5 +1,5 @@
 name: VirtualHere Client
-version: "0.1.30"
+version: "0.1.31"
 slug: vhclient
 description: VirtualHere Client
 arch: