diff --git a/zwave/CHANGELOG.md b/zwave/CHANGELOG.md
index 9372e52..8dedb60 100644
--- a/zwave/CHANGELOG.md
+++ b/zwave/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.0
+
+- Fix vnc / ozwadmin
+
 ## 0.5.4
 
 - Fix build issues with 32bit CPU
diff --git a/zwave/Dockerfile b/zwave/Dockerfile
index 521a3d9..2e194a6 100644
--- a/zwave/Dockerfile
+++ b/zwave/Dockerfile
@@ -8,6 +8,8 @@ ARG QTMQTT_VERSION
 ARG QTOZW_VERSION
 ARG QTOZWADMIN_VERSION
 ARG QTWEBSOCKETS_VERSION
+ARG NOVNC_VERSION
+ARG WEBSOCKIFY_VERSION
 
 # Install QT Open Z-Wave 
 WORKDIR /usr/src
@@ -25,9 +27,9 @@ RUN \
         qt5-qtsvg \
         rapidjson \
         ttf-freefont \
-    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-        novnc \
-        websockify \
+        python3 \
+        py3-numpy \
+        net-tools \
     && apk add --no-cache --virtual .build-dependencies \
         binutils \
         build-base \
@@ -83,6 +85,19 @@ RUN \
     && make -j $(( $(nproc) + 1 )) \
     && make install \
     \
+    && git clone --depth 1 -b \
+        v${NOVNC_VERSION} https://github.com/novnc/noVNC \
+    && cd noVNC \
+    && mkdir -p /usr/share/noVNC \
+    && rm -rf .git utils \
+    && cp -rf ./* /usr/share/noVNC/ \
+    \
+    && git clone --depth 1 -b \
+        v${WEBSOCKIFY_VERSION} https://github.com/novnc/websockify \
+    && cd websockify \
+    && python3 setup.py build \
+    && python3 setup.py install --prefix=/usr \
+    \
     && mkdir -p /usr/share/OpenZWave \
     && mv /usr/share/qt5/qt-openzwavedatabase.rcc /usr/share/OpenZWave/ \
     \
diff --git a/zwave/build.json b/zwave/build.json
index 866693c..31164d1 100644
--- a/zwave/build.json
+++ b/zwave/build.json
@@ -11,6 +11,8 @@
     "QTOZW_VERSION": "3ad9138f40a856366a7d85fb110b1ed91e1534a0",
     "QTOZWADMIN_VERSION": "da04ebfbadc57484c487ebc846431eb283e83176",
     "QTMQTT_VERSION": "5.12.8",
-    "QTWEBSOCKETS_VERSION": "5.12.8"
+    "QTWEBSOCKETS_VERSION": "5.12.8",
+    "NOVNC_VERSION": "1.2.0",
+    "WEBSOCKIFY_VERSION": "0.9.0"
   }
 }
diff --git a/zwave/config.json b/zwave/config.json
index 9cadf2b..5d9ad30 100644
--- a/zwave/config.json
+++ b/zwave/config.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenZWave",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "slug": "zwave",
   "description": "Control a ZWave network with Home Assistant",
   "arch": ["amd64", "i386", "armhf", "armv7", "aarch64"],