diff --git a/13.0/pre_upgrade.sh b/13.0/pre_upgrade.sh
index 2342186..6a9d933 100755
--- a/13.0/pre_upgrade.sh
+++ b/13.0/pre_upgrade.sh
@@ -17,9 +17,7 @@ EOF
 )
 query_postgres_container "$PRE_MIGRATE_SQL" ou13 || exit 1
 
-
 # Copy filestores
-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
+copy_filestore ou12 ou12 ou13 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 96dc64e..77c37ea 100755
--- a/14.0/pre_upgrade.sh
+++ b/14.0/pre_upgrade.sh
@@ -9,9 +9,7 @@ docker exec -u 70 "$DB_CONTAINER_NAME" pgm cp -f ou13 ou14@ou14
 PRE_MIGRATE_SQL=""
 query_postgres_container "$PRE_MIGRATE_SQL" ou14 || exit 1
 
-
 # Copy filestores
-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
+copy_filestore ou13 ou13 ou14 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 6c13ec5..59a9348 100755
--- a/15.0/pre_upgrade.sh
+++ b/15.0/pre_upgrade.sh
@@ -15,9 +15,7 @@ EOF
 echo "SQL command = $PRE_MIGRATE_SQL"
 query_postgres_container "$PRE_MIGRATE_SQL" ou15 || exit 1
 
-
 # Copy filestores
-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
+copy_filestore ou14 ou14 ou15 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 861de0b..b248ef1 100755
--- a/16.0/pre_upgrade.sh
+++ b/16.0/pre_upgrade.sh
@@ -23,9 +23,7 @@ EOF
 echo "SQL command = $PRE_MIGRATE_SQL"
 query_postgres_container "$PRE_MIGRATE_SQL" ou16 || exit 1
 
-
 # Copy filestores
-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
+copy_filestore ou15 ou15 ou16 ou16 || exit 1
 
 echo "Ready for migration to 16.0!"
diff --git a/upgrade.sh b/upgrade.sh
index d5c6103..2990b3b 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -61,6 +61,17 @@ query_postgres_container(){
 }
 export -f query_postgres_container
 
+# Function to copy the filetores
+copy_filestore(){
+    local FROM_SERVICE="$1"
+    local FROM_DB="$2"
+    local TO_SERVICE="$3"
+    local TO_DB="$4"
+    rm -rf /srv/datastore/data/"$TO_SERVICE"/var/lib/odoo/filestore/"$TO_DB" || exit 1
+    cp -a /srv/datastore/data/"$FROM_SERVICE"/var/lib/odoo/filestore/"$FROM_DB" /srv/datastore/data/"$TO_SERVICE"/var/lib/odoo/filestore/"$TO_DB" || exit 1
+    echo "Filestore $FROM_SERVICE/$FROM_DB copied."
+}
+export -f copy_filestore
 
 ##############################################
 # CHECKS ALL NEEDED COMPONENTS ARE AVAILABLE #
@@ -119,9 +130,7 @@ docker exec -u 70 $POSTGRES_SERVICE_NAME pgm cp -f "$ORIGIN_DB_NAME" "${COPY_DB_
 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
-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
-
+copy_filestore "$ORIGIN_SERVICE_NAME" "$ORIGIN_DB_NAME" "$COPY_DB_NAME" "$COPY_DB_NAME" || exit 1
 echo "UPGRADE: original filestore copied."