diff --git a/homeassistant/Dockerfile b/homeassistant/Dockerfile
index 2de1823bd..ec2634aeb 100644
--- a/homeassistant/Dockerfile
+++ b/homeassistant/Dockerfile
@@ -2,6 +2,7 @@ FROM %%BASE_IMAGE%%
 
 # Add version
 ENV VERSION %%HASS_VERSION%%
+ENV LANG C.UTF-8
 
 # install core packages
 RUN apk --no-cache add libuv git linux-headers eudev-dev libusb-dev
@@ -14,7 +15,6 @@ RUN apk --no-cache add ffmpeg nmap net-tools
 WORKDIR /usr/src/
 RUN pip3 install --no-cache-dir cython==0.25.2
 
-WORKDIR /usr/src/python-openzwave/
 RUN git clone https://github.com/OpenZWave/python-openzwave \
     && cd python-openzwave \
     && git checkout v0.3.2 \
diff --git a/supervisor/Dockerfile b/supervisor/Dockerfile
index 70d84e762..49a47e5ca 100644
--- a/supervisor/Dockerfile
+++ b/supervisor/Dockerfile
@@ -2,6 +2,7 @@ FROM %%BASE_IMAGE%%
 
 # Add version
 ENV VERSION %%SUPERVISOR_TAG%%
+ENV LANG C.UTF-8
 
 # remove several traces of python
 RUN apk del --no-cache python*
@@ -19,4 +20,8 @@ RUN pip3 install pip --no-cache-dir --upgrade \
     && pip3 install --no-cache-dir docker \
     && pip3 install --no-cache-dir colorlog
 
-CMD [ "bash" ]
+# install HassIO
+COPY hassio_api /usr/src/hassio_api
+RUN pip3 install --no-cache-dir /usr/src/hassio_api
+
+CMD [ "hassio" ]