diff --git a/.dockerignore b/.dockerignore
index 849d27a..ea51f67 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,3 @@
 views/
 applications/
-containers/
-xos/tests/api/node_modules
\ No newline at end of file
+xos/tests/api/node_modules
diff --git a/containers/xos/Dockerfile.devel b/containers/xos/Dockerfile.devel
index 5dc62a6..2b796e4 100644
--- a/containers/xos/Dockerfile.devel
+++ b/containers/xos/Dockerfile.devel
@@ -74,6 +74,10 @@
 
 ADD http://code.jquery.com/jquery-1.9.1.min.js /usr/local/lib/python2.7/dist-packages/suit/static/suit/js/
 
+# Include certificates from Openstack
+ADD containers/xos/local_certs.crt /usr/local/share/ca-certificates/local_certs.crt
+RUN update-ca-certificates
+
 # Install XOS
 ADD xos /opt/xos
 RUN chmod +x /opt/xos/tools/xos-manage
@@ -92,4 +96,4 @@
 WORKDIR /opt/xos
 
 # Define default command.
-CMD update-ca-certificates && python /opt/xos/manage.py runserver 0.0.0.0:8000 --insecure --makemigrations
+CMD python /opt/xos/manage.py runserver 0.0.0.0:8000 --insecure --makemigrations
diff --git a/containers/xos/local_certs.crt b/containers/xos/local_certs.crt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/containers/xos/local_certs.crt
diff --git a/xos/configurations/cord-pod/Makefile b/xos/configurations/cord-pod/Makefile
index 950f758..6886907 100644
--- a/xos/configurations/cord-pod/Makefile
+++ b/xos/configurations/cord-pod/Makefile
@@ -59,5 +59,6 @@
 
 .PHONY: local_containers
 local_containers:
+	cat /usr/local/share/ca-certificates/* > ../../../containers/xos/local_certs.crt
 	cd ../../../containers/xos; make devel
 	cd ../../../containers/synchronizer; make