diff --git a/Dockerfile b/Dockerfile
index 9554ec552d79a72f1e0b5724da7fd256e79d1be2..9344ec65245b6ebe9005e0a510f66ce5b8df730b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,11 +10,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends nmap net-tools && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Open Z-Wave disabled because broken
-#RUN apt-get update && \
-#    apt-get install -y cython3 libudev-dev && \
-#    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-#    pip3 install cython && \
-#    scripts/build_python_openzwave
+RUN apt-get update && \
+   apt-get install -y cython3 libudev-dev && \
+   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+   pip3 install "cython<0.23" && \
+   script/build_python_openzwave
 
 CMD [ "python", "-m", "homeassistant", "--config", "/config" ]
diff --git a/script/build_python_openzwave b/script/build_python_openzwave
index 02c088fca4406b60eb23cae904835a4bd53f90b3..029fd7873e6801d040a6771c897ac98d558c1e24 100755
--- a/script/build_python_openzwave
+++ b/script/build_python_openzwave
@@ -1,7 +1,7 @@
 # Sets up and builds python open zwave to be used with Home Assistant
-# Dependencies that need to be installed: 
+# Dependencies that need to be installed:
 # apt-get install cython3 libudev-dev python-sphinx python3-setuptools
-# pip3 install cython
+# pip3 install "cython<0.23"
 
 cd "$(dirname "$0")/.."