diff --git a/edi_storage_oca/migrations/16.0.1.0.0/post-migrate.py b/edi_storage_oca/migrations/16.0.1.0.0/post-migrate.py
new file mode 100644
index 000000000..67b3583be
--- /dev/null
+++ b/edi_storage_oca/migrations/16.0.1.0.0/post-migrate.py
@@ -0,0 +1,97 @@
+# Copyright 2024 Camptocamp SA (http://www.camptocamp.com)
+# Copyright 2024 Dixmit
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import logging
+
+from openupgradelib import openupgrade
+
+from odoo.addons.http_routing.models.ir_http import slugify
+
+_logger = logging.getLogger(__name__)
+
+
+def _get_storage_vals(code, record):
+    protocol = "odoofs"
+    options = record
+    if record["backend_type"] == "filesystem":
+        protocol = "file"
+        options = {}
+
+    if record["backend_type"] == "ftp":
+        protocol = "ftp"
+        options = {
+            "host": record["ftp_server"],
+            "port": record["ftp_server"],
+            "username": record["ftp_login"],
+            "password": record["ftp_password"],
+        }
+    if record["backend_type"] == "sftp":
+        protocol = "sftp"
+        options = {
+            "host": record["sftp_host"],
+            "ssh_kwargs": {
+                "port": record["sftp_port"],
+            },
+        }
+        if record["sftp_auth_method"] == "pwd":
+            options["ssh_kwargs"].update(
+                {
+                    "username": record["sftp_user"],
+                    "password": record["sftp_password"],
+                }
+            )
+        elif record["sftp_auth_method"] == "ssh_key":
+            _logger.warning(
+                "SSH Key requires a PrivateKey file, but we are "
+                "providing a string. Please check the migration."
+            )
+            options["ssh_kwargs"].update(
+                {
+                    "pkey": record["sftp_private_key"],
+                }
+            )
+    if record["backend_type"] == "s3":
+        protocol = "s3"
+        options = {
+            "endpoint_url": record["aws_host"],
+            "key": record["aws_access_key_id"],
+            "secret": record["aws_secret_access_key"],
+        }
+    return {
+        "name": record["name"],
+        "code": code,
+        "protocol": protocol,
+        "options": options,
+        "directory_path": record["directory_path"],
+    }
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    # make sure all backend_type can be mapped even if corresponding modules
+    # have not been migrated (on purpose because we should switch to fs_storage)
+    env.cr.execute(
+        """
+    SELECT * FROM storage_backend
+    WHERE id in (SELECT storage_id FROM edi_backend WHERE storage_id IS NOT NULL)
+    """
+    )
+    storage_field = openupgrade.get_legacy_name("storage_id")
+    column_names = [desc[0] for desc in env.cr.description]
+    storage_backend_records = []
+    for row in env.cr.fetchall():
+        storage_backend_records.append(dict(zip(column_names, row)))
+    fs_storage = env["fs.storage"]
+
+    for record in storage_backend_records:
+        code = slugify(record.get("name")).replace("-", "_")
+        if fs_storage.search([("code", "=", code)]):
+            code = "%s_%d" % (code, record.id)
+
+        res_id = fs_storage.create(_get_storage_vals(code, record))
+
+        env.cr.execute(
+            f"UPDATE edi_backend SET {storage_field} = %s WHERE storage_id = %s",
+            (res_id.id, record["id"]),
+        )
diff --git a/edi_storage_oca/migrations/16.0.1.0.0/pre-migrate.py b/edi_storage_oca/migrations/16.0.1.0.0/pre-migrate.py
new file mode 100644
index 000000000..4b0a2ea5e
--- /dev/null
+++ b/edi_storage_oca/migrations/16.0.1.0.0/pre-migrate.py
@@ -0,0 +1,14 @@
+# Copyright 2024 Camptocamp
+# Copyright 2024 Dixmit
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    """
+    We just move the data to a new column.
+    Data will be moved on post-migration
+    """
+    openupgrade.rename_columns(env.cr, {"edi_backend": [("storage_id", None)]})