diff --git a/digitalocean/createblockstorage.sh b/digitalocean/createblockstorage.sh
index a1730e67..877f9b3d 100644
--- a/digitalocean/createblockstorage.sh
+++ b/digitalocean/createblockstorage.sh
@@ -3,10 +3,11 @@ set -e
 
 if [ $# -eq 0 ]
   then
-    echo "usage: bash createblockstorage.sh [droplet-name]" && exit 1
+    echo "usage: bash createblockstorage.sh [droplet-name] [token]" && exit 1
 fi
 
 DROPLET_NAME=$1
+TOKEN=$2
 
 #Install doctl
 
@@ -21,8 +22,7 @@ sudo mkdir -p ~/.config
 #Access doctl account
 
 echo "Accessing digital ocean account..."
-doctl auth init --context data-migration
-doctl auth switch --context data-migration
+doctl auth init --access-token $TOKEN
 
 #Get droplet region and id
 echo "Fetching droplet information..."
diff --git a/digitalocean/migratedata.sh b/digitalocean/migratedata.sh
index 2b0ae16b..a705dae8 100644
--- a/digitalocean/migratedata.sh
+++ b/digitalocean/migratedata.sh
@@ -24,17 +24,17 @@ OFAC_DATA_DIR=/var/lamassu/ofac
 ID_PHOTO_CARD_DIR=/opt/lamassu-server/idphotocard
 FRONTCAMERA_DIR=/opt/lamassu-server/frontcamera
 
-mkdir -p $NEW_VOLUME_MOUNTING_POINT$CERT_DIR
-mkdir -p $NEW_VOLUME_MOUNTING_POINT$KEY_DIR
-mkdir -p $NEW_VOLUME_MOUNTING_POINT$MNEMONIC_DIR
-mkdir -p $NEW_VOLUME_MOUNTING_POINT/var/backups
-mkdir -p $NEW_VOLUME_MOUNTING_POINT/mnt
-mkdir -p $NEW_VOLUME_MOUNTING_POINT/var/lamassu
-mkdir -p $NEW_VOLUME_MOUNTING_POINT/opt/lamassu-server
+mkdir -p $NEW_VOLUME_MOUNTING_POINT/ssl/certs
+mkdir -p $NEW_VOLUME_MOUNTING_POINT/ssl/private
+mkdir -p $NEW_VOLUME_MOUNTING_POINT/mnemonics
+mkdir -p $NEW_VOLUME_MOUNTING_POINT/backups
+mkdir -p $NEW_VOLUME_MOUNTING_POINT/blockchains
+mkdir -p $NEW_VOLUME_MOUNTING_POINT/lamassu
+mkdir -p $NEW_VOLUME_MOUNTING_POINT/lamassu-server
 
 if [ -f $LAMASSU_CA_PATH ]; 
 then
-   cp $LAMASSU_CA_PATH $NEW_VOLUME_MOUNTING_POINT$CERT_DIR
+   cp $LAMASSU_CA_PATH $NEW_VOLUME_MOUNTING_POINT/ssl/certs
    echo "Successfully migrated $LAMASSU_CA_PATH"
 else 
    echo "Failed to migrate $LAMASSU_CA_PATH, file doesn't exist!"
@@ -42,7 +42,7 @@ fi
 
 if [ -f $CA_KEY_PATH ]; 
 then
-   cp $CA_KEY_PATH $NEW_VOLUME_MOUNTING_POINT$KEY_DIR
+   cp $CA_KEY_PATH $NEW_VOLUME_MOUNTING_POINT/ssl/private
    echo "Successfully migrated $CA_KEY_PATH"
 else 
    echo "Failed to migrate $CA_KEY_PATH, file doesn't exist!"
@@ -50,7 +50,7 @@ fi
 
 if [ -f $CA_PATH ]; 
 then
-   cp $CA_PATH $NEW_VOLUME_MOUNTING_POINT$CERT_DIR
+   cp $CA_PATH $NEW_VOLUME_MOUNTING_POINT/ssl/certs
    echo "Successfully migrated $CA_PATH"
 else 
    echo "Failed to migrate $CA_PATH, file doesn't exist!"
@@ -58,7 +58,7 @@ fi
 
 if [ -f $SERVER_KEY_PATH ]; 
 then
-   cp $SERVER_KEY_PATH $NEW_VOLUME_MOUNTING_POINT$KEY_DIR
+   cp $SERVER_KEY_PATH $NEW_VOLUME_MOUNTING_POINT/ssl/private
    echo "Successfully migrated $SERVER_KEY_PATH"
 else 
    echo "Failed to migrate $SERVER_KEY_PATH, file doesn't exist!"
@@ -66,7 +66,7 @@ fi
 
 if [ -f $SERVER_CERT_PATH ]; 
 then
-   cp $SERVER_CERT_PATH $NEW_VOLUME_MOUNTING_POINT$CERT_DIR
+   cp $SERVER_CERT_PATH $NEW_VOLUME_MOUNTING_POINT/ssl/certs
    echo "Successfully migrated $SERVER_CERT_PATH"
 else 
    echo "Failed to migrate $SERVER_CERT_PATH, file doesn't exist!"
@@ -74,7 +74,7 @@ fi
 
 if [ -f $MNEMONIC_FILE ]; 
 then
-   cp $MNEMONIC_FILE $NEW_VOLUME_MOUNTING_POINT$MNEMONIC_DIR
+   cp $MNEMONIC_FILE $NEW_VOLUME_MOUNTING_POINT/mnemonics
    echo "Successfully migrated $MNEMONIC_FILE"
 else 
    echo "Failed to migrate $MNEMONIC_FILE, file doesn't exist!"
@@ -82,7 +82,7 @@ fi
 
 if [ -d $BACKUP_DIR ]; 
 then
-   cp -r $BACKUP_DIR $NEW_VOLUME_MOUNTING_POINT/var/backups
+   cp -r $BACKUP_DIR $NEW_VOLUME_MOUNTING_POINT/backups
    echo "Successfully migrated $BACKUP_DIR"
 else 
    echo "Failed to migrate $BACKUP_DIR, directory doesn't exist!"
@@ -90,7 +90,7 @@ fi
 
 if [ -d $BLOCKCHAIN_DIR ]; 
 then
-   cp -r $BLOCKCHAIN_DIR $NEW_VOLUME_MOUNTING_POINT/mnt
+   cp -r $BLOCKCHAIN_DIR $NEW_VOLUME_MOUNTING_POINT/blockchains
    echo "Successfully migrated $BLOCKCHAIN_DIR"
 else 
    echo "Failed to migrate $BLOCKCHAIN_DIR, directory doesn't exist!"
@@ -98,7 +98,7 @@ fi
 
 if [ -d $OFAC_DATA_DIR ]; 
 then
-   cp -r $OFAC_DATA_DIR $NEW_VOLUME_MOUNTING_POINT/var/lamassu
+   cp -r $OFAC_DATA_DIR $NEW_VOLUME_MOUNTING_POINT/lamassu
    echo "Successfully migrated $OFAC_DATA_DIR"
 else 
    echo "Failed to migrate $OFAC_DATA_DIR, directory doesn't exist!"
@@ -106,7 +106,7 @@ fi
 
 if [ -d $ID_PHOTO_CARD_DIR ]; 
 then
-   cp -r $ID_PHOTO_CARD_DIR $NEW_VOLUME_MOUNTING_POINT/opt/lamassu-server
+   cp -r $ID_PHOTO_CARD_DIR $NEW_VOLUME_MOUNTING_POINT/lamassu-server
    echo "Successfully migrated $ID_PHOTO_CARD_DIR"
 else 
    echo "Failed to migrate $ID_PHOTO_CARD_DIR, directory doesn't exist!"
@@ -114,7 +114,7 @@ fi
 
 if [ -d $FRONTCAMERA_DIR ]; 
 then
-   cp -r $FRONTCAMERA_DIR $NEW_VOLUME_MOUNTING_POINT/opt/lamassu-server
+   cp -r $FRONTCAMERA_DIR $NEW_VOLUME_MOUNTING_POINT/lamassu-server
    echo "Successfully migrated $FRONTCAMERA_DIR"
 else 
    echo "Failed to migrate $FRONTCAMERA_DIR, directory doesn't exist!"