diff --git a/Makefile b/Makefile
index 76bee5e..98da42e 100644
--- a/Makefile
+++ b/Makefile
@@ -75,11 +75,11 @@
 	@echo
 
 build: protos docker-base
-	docker build -t cord/voltha -f Dockerfile.voltha .
-	docker build -t cord/chameleon -f Dockerfile.chameleon .
-	docker build -t cord/ofagent -f Dockerfile.ofagent .
-	docker build -t cord/podder -f Dockerfile.podder .
-	docker build -t cord/netconf -f Dockerfile.netconf .
+	docker build -t cord/voltha -f docker/Dockerfile.voltha .
+	docker build -t cord/chameleon -f docker/Dockerfile.chameleon .
+	docker build -t cord/ofagent -f docker/Dockerfile.ofagent .
+	docker build -t cord/podder -f docker/Dockerfile.podder .
+	docker build -t cord/netconf -f docker/Dockerfile.netconf .
 	docker build -t cord/shovel -f docker/Dockerfile.shovel .
 
 
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index 82f5092..7be66d2 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -10,6 +10,8 @@
   - libssl-dev
   - libffi-dev
   - libpcap-dev
+  - libxml2-dev
+  - libxslt1-dev
   - python-virtualenv
   - jq
   - python-nose
diff --git a/Dockerfile.netconf b/docker/Dockerfile.netconf
similarity index 100%
rename from Dockerfile.netconf
rename to docker/Dockerfile.netconf
diff --git a/requirements.txt b/requirements.txt
index 80291fe..13a7c0a 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,7 +38,7 @@
 Twisted>=13.2.0
 urllib3>=1.7.1
 pyang>=1.7
-lxml
+lxml==3.6.4
 dicttoxml
 
 # python-consul>=0.6.1  we need the pre-released version for now, because 0.6.1 does not