diff --git a/docker-compose-arm/Dockerfile b/docker-compose-arm/Dockerfile
index 5076a72..0a302e7 100644
--- a/docker-compose-arm/Dockerfile
+++ b/docker-compose-arm/Dockerfile
@@ -5,7 +5,7 @@
 FROM resin/rpi-raspbian:jessie
 MAINTAINER EasyPi Software Foundation
 
-ENV DOCKER_COMPOSE_VERSION 1.19.0
+ENV DOCKER_COMPOSE_VERSION 1.21.0
 ENV PYINSTALLER_VERSION 3.2.1
 
 RUN set -xe \
diff --git a/hass/Dockerfile b/hass/Dockerfile
index 46f5c08..63bbf3e 100644
--- a/hass/Dockerfile
+++ b/hass/Dockerfile
@@ -12,7 +12,8 @@ RUN set -xe \
                           linux-headers \
                           python3 \
                           python3-dev \
-    && pip3 install --no-cache-dir homeassistant
+    && pip3 install --no-cache-dir homeassistant \
+    && wget https://github.com/home-assistant/hassio-cli/releases/download/1.2.1/hassio_armhf -O /usr/local/bin/hassio
 
 VOLUME /etc/hass
 EXPOSE 8123
diff --git a/hass/arm/Dockerfile b/hass/arm/Dockerfile
index 650942a..2ca25b6 100644
--- a/hass/arm/Dockerfile
+++ b/hass/arm/Dockerfile
@@ -12,7 +12,8 @@ RUN set -xe \
                           linux-headers \
                           python3 \
                           python3-dev \
-    && pip3 install --no-cache-dir homeassistant
+    && pip3 install --no-cache-dir homeassistant \
+    && wget https://github.com/home-assistant/hassio-cli/releases/download/1.2.1/hassio_armhf -O /usr/local/bin/hassio
 
 VOLUME /etc/hass
 EXPOSE 8123