diff --git a/cooperator/__manifest__.py b/cooperator/__manifest__.py
index 3b495e1b7..cd811be83 100644
--- a/cooperator/__manifest__.py
+++ b/cooperator/__manifest__.py
@@ -8,7 +8,7 @@
 {
     "name": "Cooperators",
     "summary": "Manage your cooperators",
-    "version": "16.0.1.2.4",
+    "version": "16.0.2.0.0",
     "depends": [
         "account",
         "base_iban",
@@ -16,6 +16,7 @@
         "web",
         # todo split into cooperator_partner_firstname
         "partner_firstname",
+        "partner_company_type",
         # todo split into cooperator partner_contact_birthdate
         "partner_contact_birthdate",
         # todo split into cooperator_partner_contact_gender
diff --git a/cooperator/migrations/16.0.2.0.0/end-legal_form.py b/cooperator/migrations/16.0.2.0.0/end-legal_form.py
new file mode 100644
index 000000000..d2ea4be0a
--- /dev/null
+++ b/cooperator/migrations/16.0.2.0.0/end-legal_form.py
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+def migrate(cr, version):
+    # remove temp column after l10n modules used it to map the previous values
+    cr.execute(
+        """
+        ALTER TABLE res_partner
+        DROP COLUMN legal_form_deprecated;
+        """
+    )
+
+    # same operations for subscription_request
+    cr.execute(
+        """
+        ALTER TABLE subscription_request
+        DROP COLUMN company_type_deprecated;
+        """
+    )
diff --git a/cooperator/migrations/16.0.2.0.0/pre-legal_form.py b/cooperator/migrations/16.0.2.0.0/pre-legal_form.py
new file mode 100644
index 000000000..d51312653
--- /dev/null
+++ b/cooperator/migrations/16.0.2.0.0/pre-legal_form.py
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+def migrate(cr, version):
+    # temp column to keep the values of legal_form after we removed it
+    cr.execute(
+        """
+        ALTER TABLE res_partner
+        RENAME COLUMN legal_form to legal_form_deprecated;
+        """
+    )
+
+    # same operations for subscription_request
+    cr.execute(
+        """
+        ALTER TABLE subscription_request
+        RENAME COLUMN company_type to company_type_deprecated;
+        """
+    )
diff --git a/cooperator/models/res_partner.py b/cooperator/models/res_partner.py
index 07ec09f68..0a1f0ebe6 100644
--- a/cooperator/models/res_partner.py
+++ b/cooperator/models/res_partner.py
@@ -195,7 +195,6 @@ def _search_representative_of_member_company(self, operator, value):
     subscription_request_ids = fields.One2many(
         "subscription.request", "partner_id", string="Subscription request"
     )
-    legal_form = fields.Selection([], string="Legal form")
     data_policy_approved = cooperative_membership_field(
         "data_policy_approved",
         fields.Boolean,
diff --git a/cooperator/models/subscription_request.py b/cooperator/models/subscription_request.py
index 04a4fdfba..d3f314879 100644
--- a/cooperator/models/subscription_request.py
+++ b/cooperator/models/subscription_request.py
@@ -395,8 +395,8 @@ def _compute_subscription_amount(self):
         readonly=True,
         states={"draft": [("readonly", False)]},
     )
-    company_type = fields.Selection(
-        [],
+    partner_company_type_id = fields.Many2one(
+        "res.partner.company.type",
         string="Company type",
         readonly=True,
         states={"draft": [("readonly", False)]},
@@ -627,7 +627,7 @@ def get_partner_company_vals(self):
             "name": self.company_name,
             "is_company": self.is_company,
             "company_register_number": self.company_register_number,
-            "legal_form": self.company_type,
+            "partner_company_type_id": self.partner_company_type_id.id,
             "street": self.address,
             "zip": self.zip_code,
             "city": self.city,
diff --git a/cooperator/readme/newsfragments/167.feature.rst b/cooperator/readme/newsfragments/167.feature.rst
new file mode 100644
index 000000000..c0020e5e4
--- /dev/null
+++ b/cooperator/readme/newsfragments/167.feature.rst
@@ -0,0 +1 @@
+Use the ``partner_company_type`` module to define company types instead of using a custom selection field.
diff --git a/cooperator/tests/test_cooperator.py b/cooperator/tests/test_cooperator.py
index 949a5f7f9..cb5e76db7 100644
--- a/cooperator/tests/test_cooperator.py
+++ b/cooperator/tests/test_cooperator.py
@@ -1426,27 +1426,25 @@ def test_company_type_to_legal_form(self):
         is copied to the legal form field of the created partner.
         """
         subscription_request_vals = self.get_dummy_company_subscription_requests_vals()
-        # an existing type cannot be used because they are only defined in
-        # localization modules.
         subscription_request_model = self.env["subscription.request"]
-        res_partner_model = self.env["res.partner"]
-        subscription_request_company_type = subscription_request_model._fields[
-            "company_type"
-        ]
-        subscription_request_company_types = subscription_request_company_type.selection
-        subscription_request_company_type.selection = [("dummy_type", "Dummy Type")]
-        res_partner_legal_form = res_partner_model._fields["legal_form"]
-        res_partner_legal_forms = res_partner_legal_form.selection
-        res_partner_legal_form.selection = [("dummy_type", "Dummy Type")]
-        subscription_request_vals["company_type"] = "dummy_type"
+        partner_company_type_model = self.env["res.partner.company.type"]
+        dummy_partner_company_type_id = partner_company_type_model.create(
+            {
+                "name": "Dummy Record",
+                "shortcut": "DR",
+            }
+        )
+        subscription_request_vals[
+            "partner_company_type_id"
+        ] = dummy_partner_company_type_id.id
         subscription_request = subscription_request_model.create(
             subscription_request_vals
         )
         self.validate_subscription_request_and_pay(subscription_request)
-        self.assertEqual(subscription_request.partner_id.legal_form, "dummy_type")
-        # restore previous values
-        subscription_request_company_type.selection = subscription_request_company_types
-        res_partner_legal_form.selection = res_partner_legal_forms
+        self.assertEqual(
+            subscription_request.partner_id.partner_company_type_id,
+            dummy_partner_company_type_id,
+        )
 
     def test_cooperator_register_number_sequence_per_company(self):
         """
diff --git a/cooperator/views/res_partner_view.xml b/cooperator/views/res_partner_view.xml
index 72025d863..f5052cffd 100644
--- a/cooperator/views/res_partner_view.xml
+++ b/cooperator/views/res_partner_view.xml
@@ -73,10 +73,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                             name="representative"
                             attrs="{'invisible': ['|', ('parent_id', '=', False), ('is_company', '=', True)]}"
                         />
-                        <field
-                            name="legal_form"
-                            attrs="{'invisible': [('is_company', '=', False)]}"
-                        />
                         <field
                             name="company_register_number"
                             attrs="{'invisible': [('is_company', '=', False)], 'readonly': [('id', '!=', False)]}"
diff --git a/cooperator/views/subscription_request_view.xml b/cooperator/views/subscription_request_view.xml
index f87efb8d9..1231b2f28 100644
--- a/cooperator/views/subscription_request_view.xml
+++ b/cooperator/views/subscription_request_view.xml
@@ -120,7 +120,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                                 attrs="{'invisible': [('is_company', '=', False)], 'required': [('is_company', '=', True)]}"
                             />
                             <field
-                                name="company_type"
+                                name="partner_company_type_id"
                                 attrs="{'invisible': [('is_company', '=', False)]}"
                             />
                             <field
diff --git a/cooperator_website/README.rst b/cooperator_website/README.rst
index efdf0f41d..510829891 100644
--- a/cooperator_website/README.rst
+++ b/cooperator_website/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===================
 Cooperators Website
 ===================
@@ -13,7 +17,7 @@ Cooperators Website
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github
@@ -36,6 +40,11 @@ shares online.
 .. contents::
    :local:
 
+Known issues / Roadmap
+======================
+
+- Update the available company types in the form when a country has been selected
+
 Changelog
 =========
 
diff --git a/cooperator_website/__manifest__.py b/cooperator_website/__manifest__.py
index fa83fcb81..4fc66508e 100644
--- a/cooperator_website/__manifest__.py
+++ b/cooperator_website/__manifest__.py
@@ -6,7 +6,7 @@
 
 {
     "name": "Cooperators Website",
-    "version": "16.0.1.0.0",
+    "version": "16.0.2.0.0",
     "depends": [
         "cooperator",
         "website",
diff --git a/cooperator_website/controllers/main.py b/cooperator_website/controllers/main.py
index 96539bc5d..26480dddf 100644
--- a/cooperator_website/controllers/main.py
+++ b/cooperator_website/controllers/main.py
@@ -66,7 +66,7 @@
     "nb_parts",
     "total_parts",
     "error_msg",
-    "company_type",
+    "partner_company_type_id",
 ]
 
 
@@ -152,7 +152,7 @@ def get_values_from_user(self, values, is_company):
                 values["company_register_number"] = partner.company_register_number
                 values["company_name"] = partner.name
                 values["company_email"] = partner.email
-                values["company_type"] = partner.legal_form
+                values["partner_company_type_id"] = partner.partner_company_type_id.id
                 # contact person values
                 representative = partner.get_representative()
                 values["firstname"] = representative.firstname
@@ -186,11 +186,19 @@ def fill_values(self, values, is_company, logged, load_from_user=False):
             values["is_company"] = "on"
         if logged:
             values["logged"] = "on"
+
         values["countries"] = self.get_countries()
+        if company.default_country_id:
+            country_id = company.default_country_id.id
+        else:
+            country_id = company.country_id.id
+        if not values.get("country_id"):
+            values["country_id"] = country_id
+
         values["langs"] = self.get_langs()
         values["products"] = products
-        fields_desc = sub_req_obj.sudo().fields_get(["company_type", "gender"])
-        values["company_types"] = fields_desc["company_type"]["selection"]
+        values["partner_company_type_ids"] = self.get_company_types(country_id)
+        fields_desc = sub_req_obj.sudo().fields_get(["gender"])
         values["genders"] = fields_desc["gender"]["selection"]
         values["company"] = company
 
@@ -201,16 +209,6 @@ def fill_values(self, values, is_company, logged, load_from_user=False):
                     break
             if not values.get("share_product_id", False) and products:
                 values["share_product_id"] = products[0].id
-        if not values.get("country_id"):
-            if company.default_country_id:
-                values["country_id"] = company.default_country_id.id
-            else:
-                values["country_id"] = "20"
-        if not values.get("activities_country_id"):
-            if company.default_country_id:
-                values["activities_country_id"] = company.default_country_id.id
-            else:
-                values["activities_country_id"] = "20"
         if not values.get("lang"):
             if company.default_lang_id:
                 values["lang"] = company.default_lang_id.code
@@ -236,18 +234,24 @@ def fill_values(self, values, is_company, logged, load_from_user=False):
     def get_products_share(self, is_company):
         product_obj = request.env["product.template"]
         products = product_obj.sudo().get_web_share_products(is_company)
-
         return products
 
     def get_countries(self):
         countries = request.env["res.country"].sudo().search([])
-
         return countries
 
     def get_langs(self):
         langs = request.env["res.lang"].sudo().search([])
         return langs
 
+    def get_company_types(self, country_id):
+        company_types = (
+            request.env["res.partner.company.type"]
+            .sudo()
+            .search([("country_ids", "in", country_id)])
+        )
+        return company_types
+
     def get_selected_share(self, kwargs):
         prod_obj = request.env["product.template"]
         product_id = kwargs.get("share_product_id")
diff --git a/cooperator_website/readme/ROADMAP.rst b/cooperator_website/readme/ROADMAP.rst
new file mode 100644
index 000000000..8bc3ef0fc
--- /dev/null
+++ b/cooperator_website/readme/ROADMAP.rst
@@ -0,0 +1 @@
+- Update the available company types in the form when a country has been selected
\ No newline at end of file
diff --git a/cooperator_website/readme/newsfragments/167.feature.rst b/cooperator_website/readme/newsfragments/167.feature.rst
new file mode 100644
index 000000000..c0020e5e4
--- /dev/null
+++ b/cooperator_website/readme/newsfragments/167.feature.rst
@@ -0,0 +1 @@
+Use the ``partner_company_type`` module to define company types instead of using a custom selection field.
diff --git a/cooperator_website/static/description/index.html b/cooperator_website/static/description/index.html
index a6d896e70..3a41229bc 100644
--- a/cooperator_website/static/description/index.html
+++ b/cooperator_website/static/description/index.html
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Cooperators Website</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -360,39 +360,51 @@
 </style>
 </head>
 <body>
-<div class="document" id="cooperators-website">
-<h1 class="title">Cooperators Website</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="cooperators-website">
+<h1>Cooperators Website</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:a63b0a0c78f8358b27570a0ca7984333392a2bd48303bc157b6931519413f4f7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/cooperator_website"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-cooperator_website"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/cooperator_website"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-cooperator_website"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds the cooperator subscription form allowing to subscribe for
 shares online.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#changelog" id="toc-entry-1">Changelog</a><ul>
-<li><a class="reference internal" href="#section-1" id="toc-entry-2">16.0.1.0.0 (2023-12-04)</a></li>
-<li><a class="reference internal" href="#section-2" id="toc-entry-3">12.0.3.0.0 (2022-06-23)</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-1">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-2">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-3">16.0.1.0.0 (2023-12-04)</a></li>
+<li><a class="reference internal" href="#section-2" id="toc-entry-4">12.0.3.0.0 (2022-06-23)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-7">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
+<div class="section" id="known-issues-roadmap">
+<h2><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h2>
+<ul class="simple">
+<li>Update the available company types in the form when a country has been selected</li>
+</ul>
+</div>
 <div class="section" id="changelog">
-<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Changelog</a></h2>
 <div class="section" id="section-1">
-<h2><a class="toc-backref" href="#toc-entry-2">16.0.1.0.0 (2023-12-04)</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-3">16.0.1.0.0 (2023-12-04)</a></h3>
 <p><strong>Features</strong></p>
 <ul class="simple">
 <li>Use the <tt class="docutils literal">website.contactus_thanks</tt> webpage as a base for the thanks page
@@ -418,7 +430,7 @@ <h2><a class="toc-backref" href="#toc-entry-2">16.0.1.0.0 (2023-12-04)</a></h2>
 </ul>
 </div>
 <div class="section" id="section-2">
-<h2><a class="toc-backref" href="#toc-entry-3">12.0.3.0.0 (2022-06-23)</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">12.0.3.0.0 (2022-06-23)</a></h3>
 <p><strong>Deprecations and Removals</strong></p>
 <ul class="simple">
 <li>Removed reCAPTCHA logic out of this module. Install
@@ -427,7 +439,7 @@ <h2><a class="toc-backref" href="#toc-entry-3">12.0.3.0.0 (2022-06-23)</a></h2>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/cooperative/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -435,23 +447,25 @@ <h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-6">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-7">Authors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
@@ -460,5 +474,6 @@ <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/cooperator_website/views/subscription_template.xml b/cooperator_website/views/subscription_template.xml
index e914e4ecc..2e8f8a266 100644
--- a/cooperator_website/views/subscription_template.xml
+++ b/cooperator_website/views/subscription_template.xml
@@ -533,20 +533,24 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                     />
                 </div>
                 <div class="mb-3 field-company_type" name="company_type_container">
-                    <label for="company_type" class="form-label">Company type</label>
+                    <label
+                        for="partner_company_type_id"
+                        class="form-label"
+                    >Company type</label>
                     <select
-                        name="company_type"
-                        t-attf-class="form-select form-select-sm{{ error and 'company_type' in error and ' is-invalid' or '' }}"
+                        t-attf-class="form-select form-select-sm{{ error and 'partner_company_type_id' in error and ' is-invalid' or '' }}"
+                        id="partner_company_type_id"
+                        name="partner_company_type_id"
                         required="true"
                         t-att-readonly="logged"
                     >
                         <option value="" />
-                        <t t-foreach="company_types or []" t-as="type">
+                        <t t-foreach="partner_company_type_ids or []" t-as="type">
                             <option
-                                t-att-value="type[0]"
-                                t-att-selected="type[0] == company_type"
+                                t-att-value="type.id"
+                                t-att-selected="type.id == partner_company_type_id"
                             >
-                                <t t-out="type[1]" />
+                                <t t-out="type.display_name" />
                             </option>
                         </t>
                     </select>
diff --git a/l10n_be_cooperator/README.rst b/l10n_be_cooperator/README.rst
index e48c3fb9f..1cee6b571 100644
--- a/l10n_be_cooperator/README.rst
+++ b/l10n_be_cooperator/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===================
 Cooperators Belgium
 ===================
@@ -13,7 +17,7 @@ Cooperators Belgium
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github
diff --git a/l10n_be_cooperator/__manifest__.py b/l10n_be_cooperator/__manifest__.py
index 5849ed8b8..374579586 100644
--- a/l10n_be_cooperator/__manifest__.py
+++ b/l10n_be_cooperator/__manifest__.py
@@ -10,11 +10,12 @@
 {
     "name": "Cooperators Belgium",
     "summary": "Cooperators Belgium Localization",
-    "version": "16.0.1.2.1",
+    "version": "16.0.2.0.0",
     "depends": [
         "cooperator",
         "cooperator_website",
         "l10n_be",
+        "l10n_be_partner_company_type",
     ],
     "author": "Coop IT Easy SC, Odoo Community Association (OCA)",
     "category": "Cooperative management",
diff --git a/l10n_be_cooperator/migrations/16.0.2.0.0/post-legal_form.py b/l10n_be_cooperator/migrations/16.0.2.0.0/post-legal_form.py
new file mode 100644
index 000000000..f74a7382c
--- /dev/null
+++ b/l10n_be_cooperator/migrations/16.0.2.0.0/post-legal_form.py
@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+def migrate(cr, version):
+    # Copy the company_type from the deprecated legal_form field and
+    # use them to give the same company types from the partner_company_type
+    # module. We're using the fact that the values of the legal_form selection
+    # field are the same as the xml ids of the records in l10n_be_partner_company_type.
+    # Make sure all the legal_forms have a corresponding id in the records.
+    cr.execute(
+        """
+        UPDATE res_partner AS rp
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            rp.legal_form_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_be_partner_company_type'
+            AND imd.name = rp.legal_form_deprecated
+        """
+    )
+
+    # Same Operation for subscription_request
+    cr.execute(
+        """
+        UPDATE subscription_request AS sr
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            sr.company_type_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_be_partner_company_type'
+            AND imd.name = sr.company_type_deprecated
+        """
+    )
diff --git a/l10n_be_cooperator/models/__init__.py b/l10n_be_cooperator/models/__init__.py
index 083381db1..ca77105bf 100644
--- a/l10n_be_cooperator/models/__init__.py
+++ b/l10n_be_cooperator/models/__init__.py
@@ -3,8 +3,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-from . import res_partner
-from . import subscription_request
 from . import tax_shelter_certificate
 from . import tax_shelter_certificate_line
 from . import tax_shelter_declaration
diff --git a/l10n_be_cooperator/models/res_partner.py b/l10n_be_cooperator/models/res_partner.py
deleted file mode 100644
index 1d96b185d..000000000
--- a/l10n_be_cooperator/models/res_partner.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# SPDX-FileCopyrightText: 2019 Coop IT Easy SC
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from odoo import fields, models
-
-
-def get_company_type_selection():
-    # this list comes from
-    # https://www.belgium.be/fr/economie/entreprise/creation/types_de_societe
-    return [
-        ("aisbl", "AISBL"),
-        ("asbl", "ASBL"),
-        ("sa", "SA"),
-        ("sc", "SC"),
-        ("scomm", "SComm"),
-        ("snc", "SNC"),
-        ("srl", "SRL"),
-        # former types (before 2019)
-        ("scrl", "SCRL"),
-        ("sprl", "SPRL"),
-    ]
-
-
-class ResPartner(models.Model):
-    _inherit = "res.partner"
-
-    legal_form = fields.Selection(selection_add=get_company_type_selection())
diff --git a/l10n_be_cooperator/models/subscription_request.py b/l10n_be_cooperator/models/subscription_request.py
deleted file mode 100644
index 1bdc578aa..000000000
--- a/l10n_be_cooperator/models/subscription_request.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2019 Coop IT Easy SC
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from odoo import fields, models
-
-from . import res_partner
-
-
-class SubscriptionRequest(models.Model):
-    _inherit = "subscription.request"
-
-    company_type = fields.Selection(
-        selection_add=res_partner.get_company_type_selection()
-    )
diff --git a/l10n_be_cooperator/readme/newsfragments/167.feature.rst b/l10n_be_cooperator/readme/newsfragments/167.feature.rst
new file mode 100644
index 000000000..c0020e5e4
--- /dev/null
+++ b/l10n_be_cooperator/readme/newsfragments/167.feature.rst
@@ -0,0 +1 @@
+Use the ``partner_company_type`` module to define company types instead of using a custom selection field.
diff --git a/l10n_be_cooperator/static/description/index.html b/l10n_be_cooperator/static/description/index.html
index 17c001fda..517578200 100644
--- a/l10n_be_cooperator/static/description/index.html
+++ b/l10n_be_cooperator/static/description/index.html
@@ -3,15 +3,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Cooperators Belgium</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -359,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="cooperators-belgium">
-<h1 class="title">Cooperators Belgium</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="cooperators-belgium">
+<h1>Cooperators Belgium</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:db991e8895681f16e69df271eda4dda222dbdd2a16b564c907444f8f71530b35
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_be_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_be_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_be_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_be_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This is the Belgian localization for the Cooperators module.</p>
 <p>Features:</p>
 <ul class="simple">
@@ -397,7 +403,7 @@ <h1 class="title">Cooperators Belgium</h1>
 </ul>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h2>
 <p><strong>Tax shelter :</strong></p>
 <p>According to
 <a class="reference external" href="https://eservices.minfin.fgov.be/myminfin-web/pages/public/fisconet/document/7049b083-3ae7-4250-bb35-c00b9130fb02#_VI._Documents_justificatifs">this</a>
@@ -417,16 +423,16 @@ <h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1>
 wait before adding this information in the report.</p>
 </div>
 <div class="section" id="changelog">
-<h1><a class="toc-backref" href="#toc-entry-2">Changelog</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Changelog</a></h2>
 <div class="section" id="section-1">
-<h2><a class="toc-backref" href="#toc-entry-3">16.0.1.1.0 (2024-03-08)</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-3">16.0.1.1.0 (2024-03-08)</a></h3>
 <p><strong>Features</strong></p>
 <ul class="simple">
 <li>Improve reports based on the templates provided by the administration (<a class="reference external" href="https://finances.belgium.be/fr/entreprises/tax-shelter-petites-entreprises/debutantes-start-up">for start-ups</a> and <a class="reference external" href="https://finances.belgium.be/fr/entreprises/tax-shelter-petites-entreprises/en-croissance-scale-up">for scale-ups</a>). (<a class="reference external" href="https://github.com/OCA/cooperative/issues/112">#112</a>)</li>
 </ul>
 </div>
 <div class="section" id="section-2">
-<h2><a class="toc-backref" href="#toc-entry-4">16.0.1.0.0 (2023-12-04)</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">16.0.1.0.0 (2023-12-04)</a></h3>
 <p><strong>Features</strong></p>
 <ul class="simple">
 <li>Move classes to separate files and rename some files to improve consistency. (<a class="reference external" href="https://github.com/OCA/cooperative/issues/89">#89</a>)</li>
@@ -444,7 +450,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">16.0.1.0.0 (2023-12-04)</a></h2>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/cooperative/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -452,23 +458,25 @@ <h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-6">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-6">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-7">Authors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
@@ -477,5 +485,6 @@ <h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/l10n_ch_cooperator/README.rst b/l10n_ch_cooperator/README.rst
index 77fc16cc8..5e8431a85 100644
--- a/l10n_ch_cooperator/README.rst
+++ b/l10n_ch_cooperator/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 =======================
 Cooperators Switzerland
 =======================
@@ -13,7 +17,7 @@ Cooperators Switzerland
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github
diff --git a/l10n_ch_cooperator/__manifest__.py b/l10n_ch_cooperator/__manifest__.py
index 0c3ea51df..cb283ebac 100644
--- a/l10n_ch_cooperator/__manifest__.py
+++ b/l10n_ch_cooperator/__manifest__.py
@@ -7,9 +7,14 @@
 {
     "name": "Cooperators Switzerland",
     "summary": "Cooperators Switzerland localization",
-    "version": "16.0.1.0.0",
+    "version": "16.0.2.0.0",
     "license": "AGPL-3",
-    "depends": ["cooperator", "cooperator_website", "l10n_ch"],
+    "depends": [
+        "cooperator",
+        "cooperator_website",
+        "l10n_ch",
+        "l10n_ch_partner_company_type",
+    ],
     "author": "Coop IT Easy SC, Odoo Community Association (OCA)",
     "category": "Cooperative management",
     "website": "https://github.com/OCA/cooperative",
diff --git a/l10n_ch_cooperator/migrations/16.0.2.0.0/post-legal_form.py b/l10n_ch_cooperator/migrations/16.0.2.0.0/post-legal_form.py
new file mode 100644
index 000000000..bf107cb70
--- /dev/null
+++ b/l10n_ch_cooperator/migrations/16.0.2.0.0/post-legal_form.py
@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+def migrate(cr, version):
+    # Copy the company_type from the deprecated legal_form field and
+    # use them to give the same company types from the partner_company_type
+    # module. We're using the fact that the values of the legal_form selection
+    # field are the same as the xml ids of the records in l10n_ch_partner_company_type.
+    # Make sure all the legal_forms have a corresponding id in the records.
+    cr.execute(
+        """
+        UPDATE res_partner AS rp
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            rp.legal_form_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_ch_partner_company_type'
+            AND imd.name = rp.legal_form_deprecated
+        """
+    )
+
+    # Same Operation for subscription_request
+    cr.execute(
+        """
+        UPDATE subscription_request AS sr
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            sr.company_type_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_ch_partner_company_type'
+            AND imd.name = sr.company_type_deprecated
+        """
+    )
diff --git a/l10n_ch_cooperator/models/__init__.py b/l10n_ch_cooperator/models/__init__.py
index 3241f7822..d8d2ddbc1 100644
--- a/l10n_ch_cooperator/models/__init__.py
+++ b/l10n_ch_cooperator/models/__init__.py
@@ -2,5 +2,4 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-from . import res_partner
 from . import subscription_request
diff --git a/l10n_ch_cooperator/models/res_partner.py b/l10n_ch_cooperator/models/res_partner.py
deleted file mode 100644
index c7488b297..000000000
--- a/l10n_ch_cooperator/models/res_partner.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-FileCopyrightText: 2019 Coop IT Easy SC
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from odoo import fields, models
-
-
-def get_company_type_selection():
-    return [
-        ("ei", "Individual company"),
-        ("snc", "Partnership"),
-        ("sa", "Limited company (SA)"),
-        ("sarl", "Limited liability company (Ltd)"),
-        ("sc", "Cooperative"),
-        ("asso", "Association"),
-        ("fond", "Foundation"),
-        ("edp", "Company under public law"),
-    ]
-
-
-class ResPartner(models.Model):
-    _inherit = "res.partner"
-
-    legal_form = fields.Selection(selection_add=get_company_type_selection())
diff --git a/l10n_ch_cooperator/models/subscription_request.py b/l10n_ch_cooperator/models/subscription_request.py
index c4f26cf86..5dd507aa2 100644
--- a/l10n_ch_cooperator/models/subscription_request.py
+++ b/l10n_ch_cooperator/models/subscription_request.py
@@ -2,20 +2,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-from odoo import fields, models
-
-from . import res_partner
+from odoo import models
 
 
 class SubscriptionRequest(models.Model):
     _inherit = "subscription.request"
 
-    company_type = fields.Selection(
-        selection_add=res_partner.get_company_type_selection()
-    )
-
     def get_required_field(self):
-        req_fields = super(SubscriptionRequest, self).get_required_field()
+        req_fields = super().get_required_field()
         if "iban" in req_fields:
             req_fields.remove("iban")
 
@@ -23,5 +17,5 @@ def get_required_field(self):
 
     def check_iban(self, iban):
         if iban:
-            return super(SubscriptionRequest, self).check_iban(iban)
+            return super().check_iban(iban)
         return True
diff --git a/l10n_ch_cooperator/readme/newsfragments/167.feature.rst b/l10n_ch_cooperator/readme/newsfragments/167.feature.rst
new file mode 100644
index 000000000..c0020e5e4
--- /dev/null
+++ b/l10n_ch_cooperator/readme/newsfragments/167.feature.rst
@@ -0,0 +1 @@
+Use the ``partner_company_type`` module to define company types instead of using a custom selection field.
diff --git a/l10n_ch_cooperator/static/description/index.html b/l10n_ch_cooperator/static/description/index.html
index 52ff9764f..2747f6dde 100644
--- a/l10n_ch_cooperator/static/description/index.html
+++ b/l10n_ch_cooperator/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Cooperators Switzerland</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="cooperators-switzerland">
-<h1 class="title">Cooperators Switzerland</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="cooperators-switzerland">
+<h1>Cooperators Switzerland</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:8f89b275b2598f9a6b2875d4591289503d8ab27479ba048fdbc05990f118c0a7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_ch_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_ch_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_ch_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_ch_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This is the Swiss localization for the Cooperators module</p>
 <p>Features:</p>
 <ul class="simple">
@@ -388,7 +393,7 @@ <h1 class="title">Cooperators Switzerland</h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/cooperative/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -396,22 +401,22 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Contributors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 <li>Houssine BAKKALI &lt;<a class="reference external" href="mailto:houssine&#64;coopiteasy.be">houssine&#64;coopiteasy.be</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -424,5 +429,6 @@ <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/l10n_de_cooperator/README.rst b/l10n_de_cooperator/README.rst
index 1b253c4d7..39417a3f9 100644
--- a/l10n_de_cooperator/README.rst
+++ b/l10n_de_cooperator/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===================
 Cooperators Germany
 ===================
@@ -13,7 +17,7 @@ Cooperators Germany
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github
diff --git a/l10n_de_cooperator/__init__.py b/l10n_de_cooperator/__init__.py
index a6c9053e3..e69de29bb 100644
--- a/l10n_de_cooperator/__init__.py
+++ b/l10n_de_cooperator/__init__.py
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from . import models
diff --git a/l10n_de_cooperator/__manifest__.py b/l10n_de_cooperator/__manifest__.py
index d6c0a694f..8f5c08a2f 100644
--- a/l10n_de_cooperator/__manifest__.py
+++ b/l10n_de_cooperator/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Cooperators Germany",
     "summary": "German localization for Cooperators module",
-    "version": "16.0.1.0.0",
+    "version": "16.0.2.0.0",
     "category": "Cooperative management",
     "website": "https://github.com/OCA/cooperative",
     "author": "Coop IT Easy SC, Odoo Community Association (OCA)",
@@ -13,6 +13,7 @@
     "depends": [
         "cooperator_website",
         "l10n_de",
+        "l10n_de_partner_company_type",
     ],
     "data": [
         "views/subscription_template.xml",
diff --git a/l10n_de_cooperator/migrations/16.0.2.0.0/post-legal_form.py b/l10n_de_cooperator/migrations/16.0.2.0.0/post-legal_form.py
new file mode 100644
index 000000000..055f537d3
--- /dev/null
+++ b/l10n_de_cooperator/migrations/16.0.2.0.0/post-legal_form.py
@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+def migrate(cr, version):
+    # Copy the company_type from the deprecated legal_form field and
+    # use them to give the same company types from the partner_company_type
+    # module. We're using the fact that the values of the legal_form selection
+    # field are the same as the xml ids of the records in l10n_de_partner_company_type.
+    # Make sure all the legal_forms have a corresponding id in the records.
+    cr.execute(
+        """
+        UPDATE res_partner AS rp
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            rp.legal_form_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_de_partner_company_type'
+            AND imd.name = rp.legal_form_deprecated
+        """
+    )
+
+    # Same Operation for subscription_request
+    cr.execute(
+        """
+        UPDATE subscription_request AS sr
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            sr.company_type_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_de_partner_company_type'
+            AND imd.name = sr.company_type_deprecated
+        """
+    )
diff --git a/l10n_de_cooperator/models/__init__.py b/l10n_de_cooperator/models/__init__.py
deleted file mode 100644
index 1ba469515..000000000
--- a/l10n_de_cooperator/models/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from . import res_partner
-from . import subscription_request
diff --git a/l10n_de_cooperator/models/res_partner.py b/l10n_de_cooperator/models/res_partner.py
deleted file mode 100644
index cb034b249..000000000
--- a/l10n_de_cooperator/models/res_partner.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from odoo import fields, models
-
-
-def get_company_type_selection():
-    return [
-        ("ag", "AG"),
-        ("eg", "eG"),
-        ("gmbh", "GmbH"),
-        ("sdpr", "Stiftung des privaten Rechts"),
-    ]
-
-
-class ResPartner(models.Model):
-    _inherit = "res.partner"
-
-    legal_form = fields.Selection(selection_add=get_company_type_selection())
diff --git a/l10n_de_cooperator/models/subscription_request.py b/l10n_de_cooperator/models/subscription_request.py
deleted file mode 100644
index 5ead31e17..000000000
--- a/l10n_de_cooperator/models/subscription_request.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from odoo import fields, models
-
-from . import res_partner
-
-
-class SubscriptionRequest(models.Model):
-    _inherit = "subscription.request"
-
-    company_type = fields.Selection(
-        selection_add=res_partner.get_company_type_selection()
-    )
diff --git a/l10n_de_cooperator/readme/newsfragments/167.feature.rst b/l10n_de_cooperator/readme/newsfragments/167.feature.rst
new file mode 100644
index 000000000..c0020e5e4
--- /dev/null
+++ b/l10n_de_cooperator/readme/newsfragments/167.feature.rst
@@ -0,0 +1 @@
+Use the ``partner_company_type`` module to define company types instead of using a custom selection field.
diff --git a/l10n_de_cooperator/static/description/index.html b/l10n_de_cooperator/static/description/index.html
index 567ff77d1..d3fb71b5f 100644
--- a/l10n_de_cooperator/static/description/index.html
+++ b/l10n_de_cooperator/static/description/index.html
@@ -3,15 +3,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Cooperators Germany</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -359,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="cooperators-germany">
-<h1 class="title">Cooperators Germany</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="cooperators-germany">
+<h1>Cooperators Germany</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:73c2abbd04036ed99b7222057dcb9d2851450f3bae72d12076ba715d3eabf992
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_de_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_de_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_de_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_de_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>German localization for Cooperators module.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -383,7 +389,7 @@ <h1 class="title">Cooperators Germany</h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/cooperative/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -391,15 +397,15 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Contributors</a></h3>
 <ul class="simple">
 <li><a class="reference external" href="https://coopiteasy.be">Coop IT Easy SC</a>:<ul>
 <li>hugues de keyzer</li>
@@ -408,9 +414,11 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
@@ -419,5 +427,6 @@ <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/l10n_es_cooperator/README.rst b/l10n_es_cooperator/README.rst
index bfebd36cf..d6db284ff 100644
--- a/l10n_es_cooperator/README.rst
+++ b/l10n_es_cooperator/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 =============================
 Cooperator Spain Localization
 =============================
@@ -13,7 +17,7 @@ Cooperator Spain Localization
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github
diff --git a/l10n_es_cooperator/__manifest__.py b/l10n_es_cooperator/__manifest__.py
index dad9f973d..8933d6ff3 100644
--- a/l10n_es_cooperator/__manifest__.py
+++ b/l10n_es_cooperator/__manifest__.py
@@ -1,7 +1,7 @@
 {
     "name": "Cooperator Spain Localization",
     "summary": "Cooperator localization for Spain",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.1.0",
     "depends": [
         "cooperator",
         "cooperator_website",
diff --git a/l10n_es_cooperator/readme/newsfragments/167.feature.rst b/l10n_es_cooperator/readme/newsfragments/167.feature.rst
new file mode 100644
index 000000000..5d0eec6c7
--- /dev/null
+++ b/l10n_es_cooperator/readme/newsfragments/167.feature.rst
@@ -0,0 +1 @@
+Adapt subscription form to changes in ``cooperator_website`` and fix layout of bank account number and VAT fields.
diff --git a/l10n_es_cooperator/static/description/index.html b/l10n_es_cooperator/static/description/index.html
index e08b0c5d0..0ecc35557 100644
--- a/l10n_es_cooperator/static/description/index.html
+++ b/l10n_es_cooperator/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Cooperator Spain Localization</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="cooperator-spain-localization">
-<h1 class="title">Cooperator Spain Localization</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="cooperator-spain-localization">
+<h1>Cooperator Spain Localization</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:5f6096778165941358b0b39db24304e3d68e6b1e41ccc46265bf1e3a51705221
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_es_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_es_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_es_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_es_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon implements Spanish localization for Cooperator Module</p>
 <p>Features:</p>
 <ul class="simple">
@@ -390,12 +395,12 @@ <h1 class="title">Cooperator Spain Localization</h1>
 </ul>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h2>
 <p>Move this feature to cooperator module
 - Change property_cooperator_account to not accept deprecated account</p>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/cooperative/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -403,16 +408,16 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 <li>Coopdevs Treball SCCL</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <ul class="simple">
 <li>Coopdevs Treball SCCL<ul>
 <li>Enrico Stano</li>
@@ -424,7 +429,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -437,5 +442,6 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/l10n_es_cooperator/views/subscription_templates.xml b/l10n_es_cooperator/views/subscription_templates.xml
index 330a986f6..94124ebf1 100644
--- a/l10n_es_cooperator/views/subscription_templates.xml
+++ b/l10n_es_cooperator/views/subscription_templates.xml
@@ -6,45 +6,40 @@
         name="Become company cooperator"
         priority="150"
     >
-        <xpath expr="//label[@for='company_register_number']/.." position="replace" />
+        <xpath
+            expr="//div[@name='company_register_number_container']"
+            position="replace"
+        />
         <!-- Remove Company type field -->
-        <xpath expr="//label[@for='company_type']/.." position="replace" />
+        <xpath expr="//div[@name='company_type_container']" position="replace" />
     </template>
 
     <template id="iban_template_es" inherit_id="cooperator_website.iban_template">
         <xpath expr="//div[@name='iban_template_container']" position="inside">
 
-            <div
-                class="form-group field-bank_account"
-                t-attf-class="form-group #{error and 'iban' in error and 'has-error' or ''}"
-                name="iban_container"
-            >
-                <label for="iban">Bank Account Number</label>
+            <div class="mb-3 field-bank_account" name="iban_container">
+                <label for="iban" class="form-label">Bank Account Number</label>
                 <input
-                    class="form-control form-control-sm"
+                    t-attf-class="form-control form-control-sm{{ error and 'iban' in error and ' is-invalid' or '' }}"
                     type="text"
                     name="iban"
                     id="iban"
                     required="True"
                     t-att-readonly="logged"
-                    t-attf-value="#{iban or ''}"
+                    t-att-value="iban"
                     placeholder="ES9000246912501234567891"
                 />
-
             </div>
-            <div
-                class="form-group"
-                t-attf-class="form-group #{error and 'vat' in error and 'has-error' or ''}"
-                name="vat_container"
-            >
-                <label for="vat">VAT</label>
+            <div class="mb-3 field-vat" name="vat_container">
+                <label for="vat" class="form-label">VAT</label>
                 <input
+                    t-attf-class="form-control form-control-sm{{ error and 'vat' in error and ' is-invalid' or '' }}"
                     type="text"
-                    class="form-control form-control-sm"
                     name="vat"
-                    placeholder="Y5643925S"
+                    id="vat"
                     required="True"
-                    t-attf-value="#{vat or ''}"
+                    t-att-value="vat"
+                    placeholder="Y5643925S"
                 />
             </div>
         </xpath>
diff --git a/l10n_fr_cooperator/README.rst b/l10n_fr_cooperator/README.rst
index 21fba6d02..3812f264b 100644
--- a/l10n_fr_cooperator/README.rst
+++ b/l10n_fr_cooperator/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ==============================
 Cooperator France Localization
 ==============================
@@ -13,7 +17,7 @@ Cooperator France Localization
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github
diff --git a/l10n_fr_cooperator/__init__.py b/l10n_fr_cooperator/__init__.py
index 0650744f6..e69de29bb 100644
--- a/l10n_fr_cooperator/__init__.py
+++ b/l10n_fr_cooperator/__init__.py
@@ -1 +0,0 @@
-from . import models
diff --git a/l10n_fr_cooperator/__manifest__.py b/l10n_fr_cooperator/__manifest__.py
index 74b06c722..9fa0c0cf3 100644
--- a/l10n_fr_cooperator/__manifest__.py
+++ b/l10n_fr_cooperator/__manifest__.py
@@ -4,8 +4,13 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).#
 {
     "name": "Cooperator France Localization",
-    "version": "16.0.1.0.0",
-    "depends": ["cooperator", "cooperator_website", "l10n_fr"],
+    "version": "16.0.2.0.0",
+    "depends": [
+        "cooperator",
+        "cooperator_website",
+        "l10n_fr",
+        "l10n_fr_partner_company_type",
+    ],
     "author": "Coop IT Easy SC, Odoo Community Association (OCA)",
     "category": "Cooperative management",
     "website": "https://github.com/OCA/cooperative",
@@ -15,6 +20,7 @@
     """,
     "data": [
         "views/certificate_template.xml",
+        "views/subscription_template.xml",
     ],
     "installable": True,
     "auto-install": True,
diff --git a/l10n_fr_cooperator/migrations/16.0.2.0.0/post-legal_form.py b/l10n_fr_cooperator/migrations/16.0.2.0.0/post-legal_form.py
new file mode 100644
index 000000000..c268812d1
--- /dev/null
+++ b/l10n_fr_cooperator/migrations/16.0.2.0.0/post-legal_form.py
@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+def migrate(cr, version):
+    # Copy the company_type from the deprecated legal_form field and
+    # use them to give the same company types from the partner_company_type
+    # module. We're using the fact that the values of the legal_form selection
+    # field are the same as the xml ids of the records in l10n_fr_partner_company_type.
+    # Make sure all the legal_forms have a corresponding id in the records.
+    cr.execute(
+        """
+        UPDATE res_partner AS rp
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            rp.legal_form_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_fr_partner_company_type'
+            AND imd.name = rp.legal_form_deprecated
+        """
+    )
+
+    # Same Operation for subscription_request
+    cr.execute(
+        """
+        UPDATE subscription_request AS sr
+        SET partner_company_type_id = imd.res_id
+        FROM ir_model_data AS imd
+        WHERE
+            sr.company_type_deprecated IS NOT NULL
+            AND imd.model = 'res.partner.company.type'
+            AND imd.module = 'l10n_fr_partner_company_type'
+            AND imd.name = sr.company_type_deprecated
+        """
+    )
diff --git a/l10n_fr_cooperator/models/__init__.py b/l10n_fr_cooperator/models/__init__.py
deleted file mode 100644
index 4f14bd00a..000000000
--- a/l10n_fr_cooperator/models/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from . import subscription_request
-from . import partner
diff --git a/l10n_fr_cooperator/models/partner.py b/l10n_fr_cooperator/models/partner.py
deleted file mode 100644
index 92e9af79c..000000000
--- a/l10n_fr_cooperator/models/partner.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from odoo import fields, models
-
-
-class ResPartner(models.Model):
-    _inherit = "res.partner"
-
-    legal_form = fields.Selection(
-        selection_add=[
-            ("asso", "Association"),
-            ("eurl", "EURL / Entreprise individuelle"),
-            ("sarl", "SARL"),
-            ("sa", "SA / SAS"),
-        ],
-        ondelete={
-            "asso": "set null",
-            "eurl": "set null",
-            "sarl": "set null",
-            "sa": "set null",
-        },
-    )
diff --git a/l10n_fr_cooperator/models/subscription_request.py b/l10n_fr_cooperator/models/subscription_request.py
deleted file mode 100644
index a1b18c145..000000000
--- a/l10n_fr_cooperator/models/subscription_request.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from odoo import fields, models
-
-
-class SubscriptionRequest(models.Model):
-    _inherit = "subscription.request"
-
-    company_type = fields.Selection(
-        selection_add=[
-            ("asso", "Association"),
-            ("eurl", "EURL / Entreprise individuelle"),
-            ("sarl", "SARL"),
-            ("sa", "SA / SAS"),
-        ],
-        ondelete={
-            "asso": "set null",
-            "eurl": "set null",
-            "sarl": "set null",
-            "sa": "set null",
-        },
-    )
-
-    def get_required_field(self):
-        req_fields = super(SubscriptionRequest, self).get_required_field()
-        if "iban" in req_fields:
-            req_fields.remove("iban")
-
-        return req_fields
diff --git a/l10n_fr_cooperator/readme/newsfragments/167.feature.rst b/l10n_fr_cooperator/readme/newsfragments/167.feature.rst
new file mode 100644
index 000000000..c0020e5e4
--- /dev/null
+++ b/l10n_fr_cooperator/readme/newsfragments/167.feature.rst
@@ -0,0 +1 @@
+Use the ``partner_company_type`` module to define company types instead of using a custom selection field.
diff --git a/l10n_fr_cooperator/static/description/index.html b/l10n_fr_cooperator/static/description/index.html
index 4332fcc74..aaf2b3e05 100644
--- a/l10n_fr_cooperator/static/description/index.html
+++ b/l10n_fr_cooperator/static/description/index.html
@@ -3,15 +3,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Cooperator France Localization</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -359,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="cooperator-france-localization">
-<h1 class="title">Cooperator France Localization</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="cooperator-france-localization">
+<h1>Cooperator France Localization</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:85775bad545a5edb46492a024d5ed56873eb1a7863267d971d4aaaaf5d7f383e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_fr_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_fr_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/cooperative/tree/16.0/l10n_fr_cooperator"><img alt="OCA/cooperative" src="https://img.shields.io/badge/github-OCA%2Fcooperative-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/cooperative-16-0/cooperative-16-0-l10n_fr_cooperator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/cooperative&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This is the French localization for the Cooperators module.</p>
 <p>Features:</p>
 <ul class="simple">
@@ -388,7 +394,7 @@ <h1 class="title">Cooperator France Localization</h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/cooperative/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -396,23 +402,25 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Contributors</a></h3>
 <ul class="simple">
 <li>Coop IT Easy SC</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
@@ -421,5 +429,6 @@ <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/l10n_fr_cooperator/views/subscription_template.xml b/l10n_fr_cooperator/views/subscription_template.xml
new file mode 100644
index 000000000..a35d45245
--- /dev/null
+++ b/l10n_fr_cooperator/views/subscription_template.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<odoo>
+
+    <template id="iban_template_fr" inherit_id="cooperator_website.iban_template">
+        <xpath expr="//div[@name='iban_template_container']" position="inside">
+            <div class="mb-3 field-bank_account" name="iban_container">
+                <label for="iban" class="form-label">Bank Account Number</label>
+                <input
+                    t-attf-class="form-control form-control-sm{{ error and 'iban' in error and ' is-invalid' or '' }}"
+                    type="text"
+                    name="iban"
+                    id="iban"
+                    required="True"
+                    t-att-readonly="logged"
+                    t-att-value="iban"
+                    placeholder="FR14 1234 5678 9101 1121 3141 516"
+                />
+            </div>
+        </xpath>
+    </template>
+
+</odoo>