diff --git a/vhclient/Dockerfile b/vhclient/Dockerfile
index 6f3cd24..9297a83 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}
 
@@ -8,13 +8,25 @@ COPY rootfs /
 # Copy Python requirements file
 COPY requirements.txt /tmp/
 
-ARG BUILD_ARCH=amd64
+# Setup base
+# hadolint ignore=DL3042
 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 \
+        py3-pip=24.0-r2 \
+    \
+    && apk add --no-cache \
+        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 \
+    && rm -f -r \
+        /tmp/*
 
 # https://www.virtualhere.com/sites/default/files/usbclient/vhclient${BUILD_ARCH}
 RUN \
diff --git a/vhclient/config.yaml b/vhclient/config.yaml
index 5791553..190bad2 100644
--- a/vhclient/config.yaml
+++ b/vhclient/config.yaml
@@ -1,5 +1,5 @@
 name: VirtualHere Client
-version: "0.1.17"
+version: "0.1.18"
 slug: vhclient
 description: VirtualHere Client
 arch: