diff --git a/13.0/pre_upgrade.sh b/13.0/pre_upgrade.sh
index 9115a68..cea3d8b 100644
--- a/13.0/pre_upgrade.sh
+++ b/13.0/pre_upgrade.sh
@@ -38,8 +38,7 @@ query_postgres_container "$PRE_MIGRATE_SQL"
 
 
 # Copy filestores
-rm -rf /srv/datastore/data/ou13/var/lib/odoo/filestore/ou13/* || exit 1
-mkdir /srv/datastore/data/ou13/var/lib/odoo/filestore/ou13/* || exit 1
-cp -a /srv/datastore/data/ou12/var/lib/odoo/filestore/ou12/* /srv/datastore/data/ou13/var/lib/odoo/filestore/ou13/ || exit 1
+rm -rf /srv/datastore/data/ou13/var/lib/odoo/filestore/ou13 || exit 1
+cp -a /srv/datastore/data/ou12/var/lib/odoo/filestore/ou12 /srv/datastore/data/ou13/var/lib/odoo/filestore/ou13 || exit 1
 
 echo "Ready for migration to 13.0!"
diff --git a/14.0/pre_upgrade.sh b/14.0/pre_upgrade.sh
index fef1935..efa2561 100644
--- a/14.0/pre_upgrade.sh
+++ b/14.0/pre_upgrade.sh
@@ -30,8 +30,7 @@ query_postgres_container "$PRE_MIGRATE_SQL"
 
 
 # Copy filestores
-rm -rf /srv/datastore/data/ou14/var/lib/odoo/filestore/ou14/* || exit 1
-mkdir /srv/datastore/data/ou14/var/lib/odoo/filestore/ou14/* || exit 1
-cp -a /srv/datastore/data/ou13/var/lib/odoo/filestore/ou13/* /srv/datastore/data/ou14/var/lib/odoo/filestore/ou14/ || exit 1
+rm -rf /srv/datastore/data/ou14/var/lib/odoo/filestore/ou14 || exit 1
+cp -a /srv/datastore/data/ou13/var/lib/odoo/filestore/ou13 /srv/datastore/data/ou14/var/lib/odoo/filestore/ou14 || exit 1
 
 echo "Ready for migration to 14.0!"
diff --git a/15.0/pre_upgrade.sh b/15.0/pre_upgrade.sh
index f7a21d8..05ae7b1 100644
--- a/15.0/pre_upgrade.sh
+++ b/15.0/pre_upgrade.sh
@@ -36,8 +36,7 @@ query_postgres_container "$PRE_MIGRATE_SQL" >&1
 
 
 # Copy filestores
-rm -rf /srv/datastore/data/ou15/var/lib/odoo/filestore/ou15/* || exit 1
-mkdir /srv/datastore/data/ou15/var/lib/odoo/filestore/ou15/* || exit 1
-cp -a /srv/datastore/data/ou14/var/lib/odoo/filestore/ou14/* /srv/datastore/data/ou15/var/lib/odoo/filestore/ou15/ || exit 1
+rm -rf /srv/datastore/data/ou15/var/lib/odoo/filestore/ou15 || exit 1
+cp -a /srv/datastore/data/ou14/var/lib/odoo/filestore/ou14 /srv/datastore/data/ou15/var/lib/odoo/filestore/ou15 || exit 1
 
 echo "Ready for migration to 15.0!"
diff --git a/16.0/pre_upgrade.sh b/16.0/pre_upgrade.sh
index 2d745be..edf6b80 100644
--- a/16.0/pre_upgrade.sh
+++ b/16.0/pre_upgrade.sh
@@ -44,8 +44,7 @@ query_postgres_container "$PRE_MIGRATE_SQL"
 
 
 # Copy filestores
-rm -rf /srv/datastore/data/ou16/var/lib/odoo/filestore/ou16/* || exit 1
-mkdir /srv/datastore/data/ou16/var/lib/odoo/filestore/ou16/* || exit 1
-cp -a /srv/datastore/data/ou15/var/lib/odoo/filestore/ou15/* /srv/datastore/data/ou16/var/lib/odoo/filestore/ou16/ || exit 1
+rm -rf /srv/datastore/data/ou16/var/lib/odoo/filestore/ou16 || exit 1
+cp -a /srv/datastore/data/ou15/var/lib/odoo/filestore/ou15 /srv/datastore/data/ou16/var/lib/odoo/filestore/ou16 || exit 1
 
 echo "Ready for migration to 16.0!"
diff --git a/upgrade.sh b/upgrade.sh
index 10a909e..b9925ab 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -101,10 +101,7 @@ echo "UPGRADE: original database copied in ${COPY_DB_NAME}@${COPY_DB_NAME}."
 
 # Copy filestore
 rm -rf /srv/datastore/data/${COPY_DB_NAME}/var/lib/odoo/filestore/${COPY_DB_NAME} || exit 1
-
-mkdir /srv/datastore/data/${COPY_DB_NAME}/var/lib/odoo/filestore/${COPY_DB_NAME} || exit 1
-
-cp -a /srv/datastore/data/$ORIGIN_SERVICE_NAME/var/lib/odoo/filestore/$ORIGIN_DB_NAME/* /srv/datastore/data/$COPY_DB_NAME/var/lib/odoo/filestore/$COPY_DB_NAME/. || exit 1
+cp -a /srv/datastore/data/$ORIGIN_SERVICE_NAME/var/lib/odoo/filestore/$ORIGIN_DB_NAME /srv/datastore/data/$COPY_DB_NAME/var/lib/odoo/filestore/$COPY_DB_NAME || exit 1
 
 echo "UPGRADE: original filestore copied."