diff --git a/.dockerignore b/.dockerignore
index b4c568a26c..bacfb3817f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,5 +11,5 @@ certs/
 tests/
 Dockerfile
 
-data/
-build/
+core/data/
+core/build/
diff --git a/core/core/src/docker/deploy/Dockerfile b/core/core/src/docker/deploy/Dockerfile
index 9940583540..8f36a7c5a6 100644
--- a/core/core/src/docker/deploy/Dockerfile
+++ b/core/core/src/docker/deploy/Dockerfile
@@ -1,6 +1,6 @@
 FROM epiphany-dev:latest
 
-ADD . /epiphany/
+ADD ./core/ /epiphany/
 
 RUN mkdir /epiphany/data/ \
     && mkdir /epiphany/build/
diff --git a/core/core/src/docker/dev/Dockerfile b/core/core/src/docker/dev/Dockerfile
index 00e730a6b5..648c9a7c28 100644
--- a/core/core/src/docker/dev/Dockerfile
+++ b/core/core/src/docker/dev/Dockerfile
@@ -49,8 +49,11 @@ RUN set -x && \
     echo "==> Installing Ansible..."  && \
     pip install ansible==${ANSIBLE_VERSION} && \
     \
-    echo "==> installing azure-cli" && \
+    echo "==> installing azure-cli..." && \
     pip install azure-cli && \
+    # Uninstall pyOpenSSL: https://github.com/erjosito/ansible-azure-lab/issues/5
+    echo "==> un-installing pyOpenSSL... " && \
+    pip uninstall -y pyOpenSSL && \    
     \
     echo "==> Cleaning up..."  && \
     apk del build-dependencies && \
diff --git a/docs/home/HOWTO.md b/docs/home/HOWTO.md
index ae529d6473..a9ef0a9ab0 100644
--- a/docs/home/HOWTO.md
+++ b/docs/home/HOWTO.md
@@ -83,10 +83,10 @@ Now, to build it locally and run it:
 
 
 1. Run the following to build the image locally:
-```docker build -t epiphany-dev -f core/src/docker/dev/Dockerfile .```
+```docker build -t epiphany-dev -f core/core/src/docker/dev/Dockerfile .```
 2. To run the locally build image in a container use:
 ```docker run -it -v LOCAL_DEV_DIR:/epiphany --rm epiphany-dev```
-Where ```LOCAL_DEV_DIR``` should be replaced with the local path to you're core and data repositories. This will then be mapped to ```/epiphany``` inside the container. If everything is ok you will be presentated with a bash terminal from which one can run the Epiphany engine. Note that when filling in your data YAMLs one needs to specify the paths from the containers point of view.
+Where ```LOCAL_DEV_DIR``` should be replaced with the local path to you're epiphany repository. This will then be mapped to ```/epiphany``` inside the container. If everything is ok you will be presentated with a bash terminal from which one can run the Epiphany engine. Note that when filling in your data YAMLs one needs to specify the paths from the containers point of view.
 
 
 
@@ -105,7 +105,7 @@ For people who are only using the Epiphany engine to deploy and maintain cluster
 To get it from the registry and run it:
 1. Build an dev image described [here](#docker-image-for-development).
 2. Run the following command to build the deployment image locally:
-```docker build -t epiphany-deploy -f core/src/docker/deploy/Dockerfile .```
+```docker build -t epiphany-deploy -f core/core/src/docker/deploy/Dockerfile .```
 3. To run the pulled image in a container use: