diff --git a/.docker_files/main/__manifest__.py b/.docker_files/main/__manifest__.py
index e7a5757b..78b36ac5 100644
--- a/.docker_files/main/__manifest__.py
+++ b/.docker_files/main/__manifest__.py
@@ -13,6 +13,7 @@
     "depends": [
         "contacts",
         "partner_autocomplete_disable",
+        "partner_firstname_before_lastname",
     ],
     "installable": True,
 }
diff --git a/Dockerfile b/Dockerfile
index 4e1f8426..268d203e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS
 USER odoo
 
 COPY partner_autocomplete_disable /mnt/extra-addons/partner_autocomplete_disable
+COPY partner_firstname_before_lastname /mnt/extra-addons/partner_firstname_before_lastname
 
 COPY .docker_files/main /mnt/extra-addons/main
 COPY .docker_files/odoo.conf /etc/odoo
diff --git a/gitoo.yml b/gitoo.yml
index c180ae38..b2dc6e28 100644
--- a/gitoo.yml
+++ b/gitoo.yml
@@ -1,3 +1,8 @@
+- url: https://github.com/OCA/partner-contact
+  branch: "16.0"
+  includes:
+  - partner_firstname
+
 - url: https://github.com/OCA/queue
   branch: "16.0"
   includes:
diff --git a/partner_firstname_before_lastname/README.rst b/partner_firstname_before_lastname/README.rst
new file mode 100644
index 00000000..ac8f46f6
--- /dev/null
+++ b/partner_firstname_before_lastname/README.rst
@@ -0,0 +1,14 @@
+Partner Firstname Before Lastname
+=================================
+This module extends the partner_firstname module available on https://github.com/OCA/partner-contact.
+
+It makes the field firstname appear before lastname and automatically sets the configuration parameter
+so that the displayed name of the partner is rendered like `Firstname Lastname` instead of `Lastname, Firstname`.
+
+Contributors
+------------
+* Numigi (tm) and all its contributors (https://bit.ly/numigiens)
+
+More information
+----------------
+* Meet us at https://bit.ly/numigi-com
diff --git a/partner_firstname_before_lastname/__init__.py b/partner_firstname_before_lastname/__init__.py
new file mode 100644
index 00000000..b1b521d6
--- /dev/null
+++ b/partner_firstname_before_lastname/__init__.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# © 2024 Numigi (tm) and all its contributors (https://bit.ly/numigiens)
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+def set_partner_names_order_in_res_config_settings(cr, registry):
+    """Set the value partner_names_order in res_config_settings.
+
+    This prevents the following SQL error on every module update.
+    psycopg2.IntegrityError: column "partner_names_order" contains null values
+    """
+    cr.execute("UPDATE res_config_settings SET partner_names_order = 'first_last';")
diff --git a/partner_firstname_before_lastname/__manifest__.py b/partner_firstname_before_lastname/__manifest__.py
new file mode 100644
index 00000000..a5a2e3bd
--- /dev/null
+++ b/partner_firstname_before_lastname/__manifest__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# © 2024 Numigi (tm) and all its contributors (https://bit.ly/numigiens)
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+{
+    'name': 'Partner Firstname Before Lastname',
+    'version': '1.1.0',
+    'author': 'Numigi',
+    'maintainer': 'Numigi',
+    'website': 'https://bit.ly/numigi-com',
+    'license': 'LGPL-3',
+    'category': 'Partner Management',
+    'summary': 'Display the firstname before the lastname on partner forms.',
+    'depends': ['partner_firstname'],
+    'data': [
+        'data/ir_config_parameter.xml',
+        'views/res_partner.xml',
+    ],
+    'installable': True,
+    'post_init_hook': 'set_partner_names_order_in_res_config_settings',
+}
diff --git a/partner_firstname_before_lastname/data/ir_config_parameter.xml b/partner_firstname_before_lastname/data/ir_config_parameter.xml
new file mode 100644
index 00000000..94bda13f
--- /dev/null
+++ b/partner_firstname_before_lastname/data/ir_config_parameter.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- avoid error as the parameter is already introduced by partner_firstname -->
+        <function
+                model="ir.config_parameter"
+                name="set_param"
+                eval="('partner_names_order', 'first_last')"
+        />
+
+    </data>
+</odoo>
diff --git a/partner_firstname_before_lastname/static/description/icon.png b/partner_firstname_before_lastname/static/description/icon.png
new file mode 100644
index 00000000..92a86b10
Binary files /dev/null and b/partner_firstname_before_lastname/static/description/icon.png differ
diff --git a/partner_firstname_before_lastname/views/res_partner.xml b/partner_firstname_before_lastname/views/res_partner.xml
new file mode 100644
index 00000000..2bc5cd61
--- /dev/null
+++ b/partner_firstname_before_lastname/views/res_partner.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_partner_simple_form_firstname_before_lastname" model="ir.ui.view">
+        <field name="name">Partner Simple Form With Firstname Before Lastname</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="partner_firstname.view_partner_simple_form"/>
+        <field name="arch" type="xml">
+            <field name="firstname" position="replace"/>
+            <field name="lastname" position="before">
+                <field name="firstname" attrs="{
+                    'required': [
+                        ('lastname', '=', False),
+                        ('is_company', '=', False),
+                        ('type', '=', 'contact'),
+                    ]}"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_partner_form_firstname_before_lastname" model="ir.ui.view">
+        <field name="name">Partner Form With Firstname Before Lastname</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="partner_firstname.view_partner_form"/>
+        <field name="arch" type="xml">
+            <field name="firstname" position="replace"/>
+            <field name="lastname" position="before">
+                <field name="firstname" attrs="{
+                    'required': [
+                        ('lastname', '=', False),
+                        ('is_company', '=', False),
+                        ('type', '=', 'contact'),
+                    ]}"/>
+            </field>
+
+            <xpath expr="//field[@name='child_ids']/form//field[@name='firstname']" position="replace"/>
+            <xpath expr="//field[@name='child_ids']/form//field[@name='lastname']" position="before">
+                <field name="firstname" attrs="{
+                    'required': [
+                        ('lastname', '=', False),
+                        ('is_company', '=', False),
+                        ('type', '=', 'contact'),
+                    ]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>