diff --git a/ciao-controller/README.md b/ciao-controller/README.md
index b79cd79..b816b3d 100644
--- a/ciao-controller/README.md
+++ b/ciao-controller/README.md
@@ -38,6 +38,7 @@ docker run -it -d --name ciao-controller --net=host
        -v `pwd`/certs/cert-Controller-$YOUR_HOST.pem:/etc/pki/ciao/cert-Controller-ciao-dev.pem \
        -v `pwd`/certs/controller_cert.pem:/etc/pki/ciao/controller_cert.pem \
        -v `pwd`/certs/controller_key.pem:/etc/pki/ciao/controller_key.pem \
+       -v `pwd`/certs/ciao-image_cert.pem:/etc/pki/ciao/ciao-image_cert.pem \
        -v `pwd`/ciao-keystone_cert.pem:/etc/ca-certs/cacert.pem \
        -e IDENTITY_HOST=$YOUR_HOST -e CONTROLLER_HOST=$YOUR_HOST \
        -v $GOPATH/src/github.com/01org/ciao:/root/go/src/github.com/01org/ciao \
@@ -51,6 +52,7 @@ docker run -it --name ciao-controller --net=host
        -v `pwd`/certs/cert-Controller-$YOUR_HOST.pem:/etc/pki/ciao/cert-Controller-ciao-dev.pem \
        -v `pwd`/certs/controller_cert.pem:/etc/pki/ciao/controller_cert.pem \
        -v `pwd`/certs/controller_key.pem:/etc/pki/ciao/controller_key.pem \
+       -v `pwd`/certs/ciao-image_cert.pem:/etc/pki/ciao/ciao-image_cert.pem \
        -v `pwd`/ciao-keystone_cert.pem:/etc/ca-certs/cacert.pem \
        -e IDENTITY_HOST=$YOUR_HOST -e CONTROLLER_HOST=$YOUR_HOST \
        -v $GOPATH/src/github.com/01org/ciao:/root/go/src/github.com/01org/ciao \
diff --git a/ciao-controller/controller.sh b/ciao-controller/controller.sh
index dfc28ec..170b7f6 100755
--- a/ciao-controller/controller.sh
+++ b/ciao-controller/controller.sh
@@ -22,6 +22,7 @@ if [ ! -d "/etc/ssl" ] ; then
     ln -s /etc/ca-certs/ /etc/ssl/certs
     ln -s /etc/ca-certs/cacert.pem /usr/share/ca-certs/$hash
     cat  /etc/pki/ciao/controller_cert.pem  >> /etc/ca-certs/cacert.pem
+    cat  /etc/pki/ciao/ciao-image_cert.pem  >> /etc/ca-certs/cacert.pem
 fi
 
 # Starting the controller