diff --git a/ciao-controller/README.md b/ciao-controller/README.md
index bac2bf6..bf089d1 100644
--- a/ciao-controller/README.md
+++ b/ciao-controller/README.md
@@ -74,6 +74,9 @@ Environment Variables
 ---------------------
 - ``IDENTITY_HOST`` Specifies the Keystone URL. Example: example.com
 - ``CONTROLLER_HOST`` Specifies the CIAO Controller URL. Example: example.com
+- (Optional) ``CIAO_TENANT_NAME`` Specifies Tenant (Project) name (default=admin)
+- (Optional) ``CIAO_USERNAME`` Specifies default user name (default=admin)
+- (Optional) ``CIAO_PASSWORD`` Specifies default password (default=secret)
 - ``CEPH_ID`` Specifies the CEPH storage ID (default=admin)
 
 Extra Build ARGs
diff --git a/ciao-controller/ciaorc b/ciao-controller/ciaorc
index e471631..31d75f3 100644
--- a/ciao-controller/ciaorc
+++ b/ciao-controller/ciaorc
@@ -1,5 +1,5 @@
 export CIAO_CONTROLLER=CONTROLLER_HOST
 export CIAO_IDENTITY=https://IDENTITY_HOST:35357
-export CIAO_USERNAME=admin
-export CIAO_PASSWORD=secret
-export CIAO_TENANT_NAME=admin
+export CIAO_USERNAME=<USERNAME>
+export CIAO_PASSWORD=<PASSWORD>
+export CIAO_TENANT_NAME=<TENANT>
diff --git a/ciao-controller/controller.sh b/ciao-controller/controller.sh
index 2af27f6..d9e3d0c 100755
--- a/ciao-controller/controller.sh
+++ b/ciao-controller/controller.sh
@@ -2,10 +2,16 @@
 
 IDENTITY_HOST="${IDENTITY_HOST:-localhost}"
 CONTROLLER_HOST="${CONTROLLER_HOST:-localhost}"
+CIAO_TENANT_NAME="${CIAO_TENANT_NAME:-admin}"
+CIAO_USERNAME="${CIAO_USERNAME:-admin}"
+CIAO_SECRET="${CIAO_USERNAME:-secret}"
 CEPH_ID="${CEPH_ID:-admin}"
 
 sed -i.bak s/CONTROLLER_HOST/$CONTROLLER_HOST/g /root/ciaorc
 sed -i.bak s/IDENTITY_HOST/$IDENTITY_HOST/g /root/ciaorc
+sed -i.bak s/\<TENANT\>/$CIAO_TENANT_NAME/g /root/ciaorc
+sed -i.bak s/\<USERNAME\>/$CIAO_USERNAME/g /root/ciaorc
+sed -i.bak s/\<USERNAME\>/$CIAO_PASSWORD/g /root/ciaorc
 
 # compile the code before running it
 go install github.com/01org/ciao/...