diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1ae078b7..3152809f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,17 @@
-FROM python
+FROM python:3-slim AS builder
 
-COPY websockify-*.tar.gz /
+WORKDIR /build/websockify
 
-RUN python3 -m pip install websockify-*.tar.gz
-RUN rm -rf /websockify-* /root/.cache
+COPY ./* /build/websockify
+
+RUN pip3 install setuptools && \
+    python3 setup.py sdist --dist-dir docker/
+
+# Actual final image
+FROM python:3-slim
+COPY --from=builder /build/websockify/websockify-*.tar.gz /
+RUN python3 -m pip install websockify-*.tar.gz && \
+  rm -rf /websockify-* /root/.cache
 
 VOLUME /data
 
diff --git a/setup.py b/setup.py
index 5f8118fb..00b52957 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
       author="Joel Martin",
       author_email="github@martintribe.org",
 
-      packages=['websockify'],
+      packages=find_packages(),
       include_package_data=True,
       install_requires=[
         'numpy', 'requests',