diff --git a/hass/Dockerfile b/hass/Dockerfile
index 7948195..7c7f961 100644
--- a/hass/Dockerfile
+++ b/hass/Dockerfile
@@ -6,8 +6,15 @@ FROM alpine
 MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
-    && apk add --no-cache python3 \
-    && python3 -m pip install --no-cache-dir homeassistant
+    && apk add --no-cache build-base \
+                          linux-headers \
+                          python3 \
+                          python3-dev \
+    && pip3 install --no-cache-dir homeassistant==0.31.1 \
+                                   netdisco==0.7.2 \
+    && apk del build-base \
+               linux-headers \
+               python3-dev
 
 VOLUME /etc/hass
 EXPOSE 8123
diff --git a/hass/arm/Dockerfile b/hass/arm/Dockerfile
index 85e6070..1451183 100644
--- a/hass/arm/Dockerfile
+++ b/hass/arm/Dockerfile
@@ -6,8 +6,15 @@ FROM easypi/alpine-arm
 MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
-    && apk add --no-cache python3 \
-    && python3 -m pip install --no-cache-dir homeassistant
+    && apk add --no-cache build-base \
+                          linux-headers \
+                          python3 \
+                          python3-dev \
+    && pip3 install --no-cache-dir homeassistant==0.31.1 \
+                                   netdisco==0.7.2 \
+    && apk del build-base \
+               linux-headers \
+               python3-dev
 
 VOLUME /etc/hass
 EXPOSE 8123