diff --git a/createLiiibre b/createLiiibre
index cf27b4fd8c877461a8af425df30b251724e0aab9..57c02810026370a014f2ad741133f98c96b4ae31 100755
--- a/createLiiibre
+++ b/createLiiibre
@@ -11,6 +11,9 @@ if [ $# -ne 1 ] # we expect 1 arg
     usage
     exit 1
 fi
+
+cd /root/domains
+
 export DOMAIN=${1}
 export NUAGE_SUBDOMAIN=${NUAGE_SUBDOMAIN:-nuage}
 export CHAT_SUBDOMAIN=${CHAT_SUBDOMAIN:-chat}
@@ -21,7 +24,12 @@ mkdir -p ${NS}
 mkdir -p ${NS}/${NUAGE_SUBDOMAIN}
 mkdir -p ${NS}/${CHAT_SUBDOMAIN}
 echo export APP=rocketchat > ${NS}/${CHAT_SUBDOMAIN}/.env
+echo export S3_ENDPOINT=https://hot-objects.liiib.re > ${NS}/${CHAT_SUBDOMAIN}/.env
+echo export S3_ENDPOINT_COLD=https://cold-objects.liiib.re > ${NS}/${CHAT_SUBDOMAIN}/.env
+
 echo export APP=nextcloud > ${NS}/${NUAGE_SUBDOMAIN}/.env
+echo export S3_ENDPOINT=https://hot-objects.liiib.re > ${NS}/${NUAGE_SUBDOMAIN}/.env
+echo export S3_ENDPOINT_COLD=https://cold-objects.liiib.re > ${NS}/${NUAGE_SUBDOMAIN}/.env
 cp ./common/rocketchat/config.yaml ${NS}/${CHAT_SUBDOMAIN}/
 
 kubectl create ns ${NS} || true
@@ -72,22 +80,29 @@ export AWS_ACCESS_KEY_ID=${NS}-dumps
 export AWS_SECRET_ACCESS_KEY=`openssl rand -base64 18`
 mc admin user add cold ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY}
 kubectl -n ${NS} create secret generic ${AWS_ACCESS_KEY_ID} --from-literal=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} --from-literal=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-mc admin policy set minio username-rw user=${AWS_ACCESS_KEY_ID}
+mc admin policy set cold username-rw user=${AWS_ACCESS_KEY_ID}
+mc mb cold/${AWS_ACCESS_KEY_ID}
 
 ## Create data buckets
 ### For chats
 export AWS_ACCESS_KEY_ID=${CHAT_SUBDOMAIN}-${NS}
 export AWS_SECRET_ACCESS_KEY=`openssl rand -base64 18`
 mc admin user add hot ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY}
-kubectl -n ${NS} create secret generic ${AWS_ACCESS_KEY_ID} --from-literal=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} --from-literal=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-mc admin policy set minio username-rw user=${AWS_ACCESS_KEY_ID}
+kubectl -n ${NS} create secret generic ${AWS_ACCESS_KEY_ID}-s3 --from-literal=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} --from-literal=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+mc admin policy set hot username-rw user=${AWS_ACCESS_KEY_ID}
+mc mb hot/${AWS_ACCESS_KEY_ID}
+mc version enable hot/${AWS_ACCESS_KEY_ID}
+
 
 ### For Nuage
 export AWS_ACCESS_KEY_ID=${NUAGE_SUBDOMAIN}-${NS}
 export AWS_SECRET_ACCESS_KEY=`openssl rand -base64 18`
 mc admin user add hot ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY}
-kubectl -n ${NS} create secret generic ${AWS_ACCESS_KEY_ID} --from-literal=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} --from-literal=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-mc admin policy set minio username-rw user=${AWS_ACCESS_KEY_ID}
+kubectl -n ${NS} create secret generic ${AWS_ACCESS_KEY_ID}-s3 --from-literal=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} --from-literal=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+mc admin policy set hot username-rw user=${AWS_ACCESS_KEY_ID}
+mc mb hot/${AWS_ACCESS_KEY_ID}
+mc version enable hot/${AWS_ACCESS_KEY_ID}
+
 
 # Create secrets
 mkdir /tmp/${NS}
diff --git a/policy/README.md b/policy/README.md
index 8803109a0438f787879a0fabc6c922590531373f..9d589f0e323d8add7907909bda34f6ca991cf3f6 100644
--- a/policy/README.md
+++ b/policy/README.md
@@ -1,5 +1,5 @@
 # Deploy policies for hot and cold buckets
 
-mc admin policy add hot username-rw ./policy.json
-mc admin policy add cold username-rw /policy.json
+mc admin policy add hot username-rw ./username-rw.json
+mc admin policy add cold username-rw ./username-rw.json