diff --git a/Dockerfile.ofagent b/Dockerfile.ofagent
index 4f23ad1..a64626c 100644
--- a/Dockerfile.ofagent
+++ b/Dockerfile.ofagent
@@ -35,10 +35,10 @@
     rm -f *.deb
 
 # Bundle app source
-COPY ofagent /ofagent
-COPY common /common
+RUN mkdir /ofagent && touch /ofagent/__init__.py
+ENV PYTHONPATH=/ofagent
+COPY common /ofagent/common
+COPY ofagent /ofagent/ofagent
 
 # Exposing process and default entry point
-# EXPOSE 8000
-
-CMD ["python", "ofagent/main.py"]
+CMD ["python", "ofagent/ofagent/main.py"]