diff --git a/containers/xos/Dockerfile.base b/containers/xos/Dockerfile.base
index d89e6e8..14735e0 100644
--- a/containers/xos/Dockerfile.base
+++ b/containers/xos/Dockerfile.base
@@ -12,6 +12,7 @@
 
 # Install apt packages
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
+    apt-transport-https \
     curl \
     gcc \
     geoip-database \
diff --git a/containers/xos/Dockerfile.test b/containers/xos/Dockerfile.test
index 1d4791e..7829c21 100644
--- a/containers/xos/Dockerfile.test
+++ b/containers/xos/Dockerfile.test
@@ -1,7 +1,8 @@
 FROM       xosproject/xos
 
 # install nodejs
-RUN apt-key add /opt/xos/containers/xos/nodesource.gpg.key
+COPY containers/xos/nodesource.gpg.key /tmp/nodesource.gpg.key
+RUN apt-key add /tmp/nodesource.gpg.key
 RUN echo "deb https://deb.nodesource.com/node_4.x trusty main" \
   > /etc/apt/sources.list.d/nodesource.list
 
diff --git a/containers/xos/Makefile b/containers/xos/Makefile
index 23b4445..b3445cb 100644
--- a/containers/xos/Makefile
+++ b/containers/xos/Makefile
@@ -14,7 +14,7 @@
 
 NO_DOCKER_CACHE    ?= false
 
-CONTAINER_NAME	   ?= xos-server
+CONTAINER_NAME     ?= xos-server
 IMAGE_NAME         ?= xosproject/xos
 
 XOS_GIT_REPO       ?= git://github.com/open-cloud/xos.git
@@ -38,11 +38,11 @@
 
 devel:
 	sudo docker build  --no-cache=${NO_DOCKER_CACHE} --rm \
-	-f containers/xos/Dockerfile.devel -t ${IMAGE_NAME} ../..
+	-f Dockerfile.devel -t ${IMAGE_NAME} ../..
 
 test:
 	sudo docker build  --no-cache=${NO_DOCKER_CACHE} --rm \
-	-f containers/xos/Dockerfile.test -t xosproject/xos-test ../..
+	-f Dockerfile.test -t xosproject/xos-test ../..
 
 run:
 	sudo docker run -d --name ${CONTAINER_NAME} -p 80:8000 \