diff --git a/Dockerfile.voltha b/Dockerfile.voltha
index 405f499..f47f9c0 100644
--- a/Dockerfile.voltha
+++ b/Dockerfile.voltha
@@ -22,9 +22,11 @@
 MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
 
 # Bundle app source
-COPY voltha /voltha
-COPY common /common
+RUN mkdir /voltha && touch /voltha/__init__.py
+ENV PYTHONPATH=/voltha
+COPY common /voltha/common
+COPY voltha /voltha/voltha
 
 # Exposing process and default entry point
 # EXPOSE 8000
-CMD ["python", "voltha/main.py"]
+CMD ["python", "voltha/voltha/main.py"]