diff --git a/account_ebics/wizards/ebics_xfer.xml b/account_ebics/wizards/ebics_xfer.xml
index 2f48080..a4f61f3 100644
--- a/account_ebics/wizards/ebics_xfer.xml
+++ b/account_ebics/wizards/ebics_xfer.xml
@@ -94,6 +94,7 @@
                         name="format_id"
                         domain="[('id', 'in', upload_format_ids)]"
                         required="1"
+                        readonly="context.get('active_model') == 'account.payment.order'"
                     />
           <field name="order_type" />
           <field
diff --git a/account_ebics_payment_order/README.rst b/account_ebics_payment_order/README.rst
index 2bb94ee..571a0fc 100644
--- a/account_ebics_payment_order/README.rst
+++ b/account_ebics_payment_order/README.rst
@@ -16,9 +16,13 @@ This module depends upon the following modules (cf. apps.odoo.com):
 - account_ebics
 - account_payment_order
 
+Configuration
+=============
+
+Set the EBICS File Format on your Payment Modes.
+
 Usage
 =====
 
 Create your Payment Order and generate the bank file.
 Upload the generated file via the 'EBICS Upload' button on the payment order.
-
diff --git a/account_ebics_payment_order/__manifest__.py b/account_ebics_payment_order/__manifest__.py
index c7c14f7..23a1cdc 100644
--- a/account_ebics_payment_order/__manifest__.py
+++ b/account_ebics_payment_order/__manifest__.py
@@ -1,9 +1,9 @@
-# Copyright 2009-2023 Noviat.
+# Copyright 2009-2024 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 
 {
     "name": "Upload Payment Order via EBICS",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.1.0",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
@@ -11,6 +11,7 @@
     "depends": ["account_ebics", "account_payment_order"],
     "data": [
         "views/account_payment_order_views.xml",
+        "views/account_payment_mode_views.xml",
     ],
     "images": ["static/description/cover.png"],
     "installable": True,
diff --git a/account_ebics_payment_order/models/__init__.py b/account_ebics_payment_order/models/__init__.py
index 429f032..72b2653 100644
--- a/account_ebics_payment_order/models/__init__.py
+++ b/account_ebics_payment_order/models/__init__.py
@@ -1 +1,2 @@
+from . import account_payment_mode
 from . import account_payment_order
diff --git a/account_ebics_payment_order/models/account_payment_mode.py b/account_ebics_payment_order/models/account_payment_mode.py
new file mode 100644
index 0000000..92a9fc4
--- /dev/null
+++ b/account_ebics_payment_order/models/account_payment_mode.py
@@ -0,0 +1,15 @@
+# Copyright 2009-2024 Noviat.
+# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
+
+from odoo import fields, models
+
+
+class AccountPaymentMode(models.Model):
+    _inherit = "account.payment.mode"
+
+    ebics_format_id = fields.Many2one(
+        comodel_name="ebics.file.format",
+        string="EBICS File Format",
+        domain="[('type', '=', 'up')]",
+        help="Select EBICS File Format to upload.",
+    )
diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py
index 030f313..68de206 100644
--- a/account_ebics_payment_order/models/account_payment_order.py
+++ b/account_ebics_payment_order/models/account_payment_order.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2023 Noviat.
+# Copyright 2009-2024 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 
 from odoo import _, models
@@ -10,6 +10,18 @@ class AccountPaymentOrder(models.Model):
 
     def ebics_upload(self):
         self.ensure_one()
+        ctx = self._context.copy()
+        ebics_format_id = self.payment_mode_id.ebics_format_id
+        if not ebics_format_id:
+            raise UserError(
+                _("Missing EBICS File Format setting on your Payment Mode.")
+            )
+        ctx.update(
+            {
+                "active_model": self._name,
+                "default_format_id": ebics_format_id.id,
+            }
+        )
         attach = self.env["ir.attachment"].search(
             [("res_model", "=", self._name), ("res_id", "=", self.id)]
         )
diff --git a/account_ebics_payment_order/views/account_payment_mode_views.xml b/account_ebics_payment_order/views/account_payment_mode_views.xml
new file mode 100644
index 0000000..76d66e5
--- /dev/null
+++ b/account_ebics_payment_order/views/account_payment_mode_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="account_payment_mode_form" model="ir.ui.view">
+        <field name="name">account.payment.mode.form</field>
+        <field name="model">account.payment.mode</field>
+        <field name="inherit_id" ref="account_payment_mode.account_payment_mode_form" />
+        <field name="arch" type="xml">
+            <field name="payment_type" position="after">
+                <field
+                    name="ebics_format_id"
+                    attrs="{'invisible': [('payment_order_ok', '=', False)]}"
+                />
+            </field>
+        </field>
+    </record>
+
+</odoo>