diff --git a/docker-compose.yml b/docker-compose.yml
index 6cca7b3..15f3bf9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,20 +4,20 @@ services:
 
   mysql-server:
     image: mysql-server:$VERSION_MYSQL
-    build: "https://git.scimetis.net/yohan/docker-mysql.git"
+    #build: "https://git.scimetis.net/yohan/docker-mysql.git"
     container_name: mysql-server
     restart: always
     networks:
       - mysqlnet
     volumes:
-      - mysql-server_data:/var/lib/mysql:Z
-      - mysql-server_dumps:/mnt/dumps:Z
+      - /mnt/volumes/mysql-server_data/data:/var/lib/mysql:Z
+      - /mnt/volumes/mysql-server_dumps/data:/mnt/dumps:Z
       - ./nettoyer_quotas.sh:/root/nettoyer_quotas.sh:Z
       - ./debian.cnf:/etc/mysql/debian.cnf:Z
  
   cron:
     image: cron:$VERSION_CRON
-    build: "https://git.scimetis.net/yohan/docker-cron.git"
+    #build: "https://git.scimetis.net/yohan/docker-cron.git"
     restart: always
     network_mode: "host"
     volumes:
@@ -27,12 +27,3 @@ networks:
 
   mysqlnet:
     external: true
-
-volumes:
-
-  mysql-server_data:
-    external: true
-
-  mysql-server_dumps:
-    external: true
-
diff --git a/start_or_update.sh b/start_or_update.sh
index ac7afad..9796252 100755
--- a/start_or_update.sh
+++ b/start_or_update.sh
@@ -1,14 +1,58 @@
 #!/bin/bash
 test -z $1 || HOST="_$1"
 test -z $2 || INSTANCE="_$2"
-test -f ~/secrets.tar.gz.enc || curl -o ~/secrets.tar.gz.enc "https://cloud.scimetis.net/s/${KEY}/download?path=%2F&files=secrets.tar.gz.enc"
+test -f ~/secrets.tar.gz.enc || { echo "ERROR: ~/secrets.tar.gz.enc not found, exiting."; exit 1; }
 openssl enc -aes-256-cbc -d -in ~/secrets.tar.gz.enc | tar -zxv --strip 2 secrets/docker-mysql-stack${HOST}${INSTANCE}/crontab secrets/docker-mysql-stack${HOST}${INSTANCE}/debian.cnf
 sudo chown root. crontab debian.cnf
 sudo chmod 644 crontab
-# --force-recreate is used to recreate container when crontab file has changed
+
+test -f ~/openrc.sh || { echo "ERROR: ~/openrc.sh not found, exiting."; exit 1; }
+source ~/openrc.sh
+INSTANCE=$(/home/yohan/env_py3/bin/openstack server show -c id --format value $(hostname))
+for VOLUME in mysql-server_data mysql-server_dumps
+do
+    if ! mountpoint -q /mnt/volumes/${VOLUME}
+    then
+         VOLUME_ID=$(/home/yohan/env_py3/bin/openstack volume show ${VOLUME} -c id --format value)
+         test -e /dev/disk/by-id/*${VOLUME_ID:0:20} || nova volume-attach $INSTANCE $VOLUME_ID auto
+         sleep 3
+         sudo mount /dev/disk/by-id/*${VOLUME_ID:0:20} /mnt/volumes/${VOLUME}
+         mountpoint -q /mnt/volumes/${VOLUME} || { echo "ERROR: could not mount /mnt/volumes/${VOLUME}, exiting."; exit 1; }
+    fi
+done
+
+export OS_REGION_NAME=GRA
+test -f ~/duplicity_password.sh || { echo "ERROR: ~/duplicity_password.sh not found, exiting."; exit 1; }
+source ~/duplicity_password.sh
+
+sudo docker image inspect duplicity:latest &> /dev/null ||{ echo "ERROR: duplicity:latest image not found, exiting."; exit 1; }
+
+rm -rf ~/build
+mkdir -p ~/build
+for name in docker-cron docker-mysql
+do  
+    sudo -E docker run --rm -e SWIFT_USERNAME=$OS_USERNAME \
+                            -e SWIFT_PASSWORD=$OS_PASSWORD \
+                            -e SWIFT_AUTHURL=$OS_AUTH_URL \
+                            -e SWIFT_AUTHVERSION=$OS_IDENTITY_API_VERSION \
+                            -e SWIFT_TENANTNAME=$OS_TENANT_NAME \
+                            -e SWIFT_REGIONNAME=$OS_REGION_NAME \
+                            -e PASSPHRASE=$PASSPHRASE \
+      --name backup-restore -v ~/build:/mnt/build --entrypoint /bin/bash duplicity:latest \
+      -c "duplicity restore --name bootstrap --file-to-restore ${name}.tar.gz swift://bootstrap /mnt/build/${name}.tar.gz"
+    tar -xzf ~/build/${name}.tar.gz -C ~/build/
+done
+
 unset VERSION_MYSQL VERSION_CRON
-VERSION_MYSQL=$(git ls-remote https://git.scimetis.net/yohan/docker-mysql.git| head -1 | cut -f 1|cut -c -10) \
-VERSION_CRON=$(git ls-remote https://git.scimetis.net/yohan/docker-cron.git| head -1 | cut -f 1|cut -c -10) \
- sudo -E bash -c 'docker-compose up -d --force-recreate'
+DIRECTORY=$(pwd)
+cd ~/build/docker-mysql; export VERSION_MYSQL=$(git show-ref --head| head -1 | cut -f 1|cut -c -10); cd $DIRECTORY
+cd ~/build/docker-cron; export VERSION_CRON=$(git show-ref --head| head -1 | cut -f 1|cut -c -10); cd $DIRECTORY
+
+sudo docker build -t mysql-server:$VERSION_MYSQL ~/build/docker-mysql
+sudo docker build -t cron:$VERSION_CRON ~/build/docker-cron
+
+sudo -E bash -c 'docker-compose up -d --force-recreate'
+# --force-recreate is used to recreate container when crontab file has changed
 # We cannot remove the secrets files or restarting the container would become impossible
-#rm -f crontab debian.cnf
+# rm -f crontab debian.cnf
+rm -rf ~/build