diff --git a/maintenance_project/README.rst b/maintenance_project/README.rst
index 32a2fb9d3..5167d1cd2 100644
--- a/maintenance_project/README.rst
+++ b/maintenance_project/README.rst
@@ -30,7 +30,7 @@ Maintenance Projects
 
 This module extends the functionality of Odoo Maintenance module adding this features:
 
-- Adds a project to an equipment. The project can be automatically created from the equipment definition.
+- Adds a project to an equipment. You can link an existing project or create a new one (with the Create project button) after creating the equipment.
 - Adds project and task to a maintenance request. The default project for a request will be the equipment one, including the preventive requests periodically created.
 
 This is is a technical addon to allow timesheet assignment to a maintenance request.
diff --git a/maintenance_project/__manifest__.py b/maintenance_project/__manifest__.py
index 3ac777887..1051d538e 100644
--- a/maintenance_project/__manifest__.py
+++ b/maintenance_project/__manifest__.py
@@ -10,7 +10,6 @@
     "website": "https://github.com/OCA/maintenance",
     "depends": ["base_maintenance", "project"],
     "data": [
-        "security/maintenance_project_security.xml",
         "views/maintenance_equipment_views.xml",
         "views/maintenance_request_views.xml",
         "views/project_project_views.xml",
diff --git a/maintenance_project/data/demo_maintenance_project.xml b/maintenance_project/data/demo_maintenance_project.xml
index d41b6febd..a7f83eaa3 100644
--- a/maintenance_project/data/demo_maintenance_project.xml
+++ b/maintenance_project/data/demo_maintenance_project.xml
@@ -21,7 +21,6 @@
         <field name="assign_date" eval="time.strftime('%Y-%m-10')" />
         <field name="serial_no">S/N 1</field>
         <field name="model">MODEL1</field>
-        <field name="create_project_from_equipment" eval="False" />
         <field name="project_id" ref="maintenance_project.project_project_1" />
     </record>
     <record id="equipment_2" model="maintenance.equipment">
@@ -36,7 +35,6 @@
         <field name="assign_date" eval="time.strftime('%Y-%m-10')" />
         <field name="serial_no">S/N 2</field>
         <field name="model">MODEL2</field>
-        <field name="create_project_from_equipment" eval="False" />
         <field name="project_id" ref="maintenance_project.project_project_1" />
         <field name="period" eval="30" />
         <field name="maintenance_duration" eval="2" />
@@ -53,6 +51,10 @@
         <field name="assign_date" eval="time.strftime('%Y-%m-10')" />
         <field name="serial_no">S/N 3</field>
         <field name="model">MODEL3</field>
-        <field name="create_project_from_equipment" eval="True" />
     </record>
+    <function
+        model="maintenance.equipment"
+        name="action_create_project"
+        eval="[[ref('equipment_3')]]"
+    />
 </odoo>
diff --git a/maintenance_project/models/maintenance_equipment.py b/maintenance_project/models/maintenance_equipment.py
index 27c050118..cde8a9def 100644
--- a/maintenance_project/models/maintenance_equipment.py
+++ b/maintenance_project/models/maintenance_equipment.py
@@ -1,31 +1,27 @@
 # Copyright 2019 Solvos Consultoría Informática (<http://www.solvos.es>)
+# Copyright 2024 Tecnativa - Víctor Martínez
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class MaintenanceEquipment(models.Model):
     _inherit = "maintenance.equipment"
 
     project_id = fields.Many2one(comodel_name="project.project", ondelete="restrict")
-    create_project_from_equipment = fields.Boolean(default=True)
     preventive_default_task_id = fields.Many2one(
         string="Default Task", comodel_name="project.task"
     )
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        project_obj = self.env["project.project"]
-        for values in vals_list:
-            if values.get("create_project_from_equipment"):
-                new_project = project_obj.create(
-                    self._prepare_project_from_equipment_values(values)
-                )
-                values["project_id"] = new_project.id
-        return super().create(vals_list)
+    def action_create_project(self):
+        self.ensure_one()
+        if not self.project_id:
+            self.project_id = self.env["project.project"].create(
+                self._prepare_project_from_equipment_values()
+            )
 
-    def _prepare_project_from_equipment_values(self, values):
+    def _prepare_project_from_equipment_values(self):
         """
         Default project data creation hook
         """
-        return {"name": values.get("name")}
+        return {"name": self.name}
diff --git a/maintenance_project/readme/DESCRIPTION.rst b/maintenance_project/readme/DESCRIPTION.rst
index 060abd8f9..b151978ff 100644
--- a/maintenance_project/readme/DESCRIPTION.rst
+++ b/maintenance_project/readme/DESCRIPTION.rst
@@ -1,6 +1,6 @@
 This module extends the functionality of Odoo Maintenance module adding this features:
 
-- Adds a project to an equipment. The project can be automatically created from the equipment definition.
+- Adds a project to an equipment. You can link an existing project or create a new one (with the Create project button) after creating the equipment.
 - Adds project and task to a maintenance request. The default project for a request will be the equipment one, including the preventive requests periodically created.
 
 This is is a technical addon to allow timesheet assignment to a maintenance request.
diff --git a/maintenance_project/security/maintenance_project_security.xml b/maintenance_project/security/maintenance_project_security.xml
deleted file mode 100644
index 14b6f309a..000000000
--- a/maintenance_project/security/maintenance_project_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <record id="maintenance.group_equipment_manager" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('project.group_project_manager'))]" />
-    </record>
-</odoo>
diff --git a/maintenance_project/static/description/index.html b/maintenance_project/static/description/index.html
index e52cd904f..ada808b70 100644
--- a/maintenance_project/static/description/index.html
+++ b/maintenance_project/static/description/index.html
@@ -1,4 +1,3 @@
-<?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>
@@ -372,7 +371,7 @@ <h1 class="title">Maintenance Projects</h1>
 <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/maintenance/tree/16.0/maintenance_project"><img alt="OCA/maintenance" src="https://img.shields.io/badge/github-OCA%2Fmaintenance-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/maintenance-16-0/maintenance-16-0-maintenance_project"><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/maintenance&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 extends the functionality of Odoo Maintenance module adding this features:</p>
 <ul class="simple">
-<li>Adds a project to an equipment. The project can be automatically created from the equipment definition.</li>
+<li>Adds a project to an equipment. You can link an existing project or create a new one (with the Create project button) after creating the equipment.</li>
 <li>Adds project and task to a maintenance request. The default project for a request will be the equipment one, including the preventive requests periodically created.</li>
 </ul>
 <p>This is is a technical addon to allow timesheet assignment to a maintenance request.</p>
diff --git a/maintenance_project/tests/test_maintenance_project.py b/maintenance_project/tests/test_maintenance_project.py
index 6ed884f0e..90218bf06 100644
--- a/maintenance_project/tests/test_maintenance_project.py
+++ b/maintenance_project/tests/test_maintenance_project.py
@@ -1,22 +1,33 @@
 # Copyright 2019 Solvos Consultor??a Inform??tica (<http://www.solvos.es>)
+# Copyright 2024 Tecnativa - Víctor Martínez
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-import odoo.tests.common as test_common
+from odoo.tests import Form, new_test_user
+from odoo.tests.common import users
 
+from odoo.addons.base.tests.common import BaseCommon
 
-class TestMaintenanceProject(test_common.TransactionCase):
+
+class TestMaintenanceProject(BaseCommon):
     @classmethod
     def setUpClass(cls):
-        super(TestMaintenanceProject, cls).setUpClass()
-
+        super().setUpClass()
         cls.cron = cls.env.ref("maintenance.maintenance_requests_cron")
         cls.project1 = cls.env["project.project"].create({"name": "My project"})
-        cls.project_demo1 = cls.env.ref("maintenance_project.project_project_1")
-
+        cls.project_demo = cls.env.ref("maintenance_project.project_project_1")
+        new_test_user(
+            cls.env,
+            login="test-user",
+            groups="maintenance.group_equipment_manager,project.group_project_user",
+        )
+        new_test_user(
+            cls.env,
+            login="test-project_manager-user",
+            groups="maintenance.group_equipment_manager,project.group_project_manager",
+        )
         cls.equipment1 = cls.env["maintenance.equipment"].create(
             {
                 "name": "My equipment",
-                "create_project_from_equipment": True,
                 "maintenance_team_id": cls.env.ref(
                     "maintenance.equipment_team_metrology"
                 ).id,
@@ -27,50 +38,64 @@ def setUpClass(cls):
         cls.equipment2 = cls.env["maintenance.equipment"].create(
             {
                 "name": "My equipment without project",
-                "create_project_from_equipment": False,
             }
         )
         cls.equipment3 = cls.env["maintenance.equipment"].create(
             {
                 "name": "My equipment with related project",
-                "create_project_from_equipment": False,
                 "project_id": cls.project1.id,
             }
         )
+        cls.equipment_demo = cls.env.ref("maintenance_project.equipment_3")
 
-        cls.equipment_demo1 = cls.env.ref("maintenance_project.equipment_1")
-        cls.equipment_demo2 = cls.env.ref("maintenance_project.equipment_2")
-        cls.equipment_demo3 = cls.env.ref("maintenance_project.equipment_3")
-
-    def test_maintenance_equipment_project(self):
-        self.assertEqual(self.equipment1.name, self.equipment1.project_id.name)
+    def test_maintenance_equipment_project_misc(self):
+        self.assertFalse(self.equipment1.project_id)
         self.assertFalse(self.equipment2.project_id)
         self.assertEqual(self.equipment3.project_id, self.project1)
-        self.assertEqual(
-            self.equipment_demo3.name, self.equipment_demo3.project_id.name
+        self.assertEqual(self.equipment_demo.name, self.equipment_demo.project_id.name)
+
+    @users("test-project_manager-user")
+    def test_maintenance_equipment_project_admin(self):
+        equipment_a = self.env["maintenance.equipment"].create(
+            {
+                "name": "Test equipment A",
+            }
+        )
+        self.assertFalse(equipment_a.project_id)
+        equipment_a.action_create_project()
+        self.assertTrue(equipment_a.project_id)
+        self.assertEqual(equipment_a.name, equipment_a.project_id.name)
+        equipment_b = self.env["maintenance.equipment"].create(
+            {
+                "name": "Test equipment b",
+                "project_id": self.project1.id,
+            }
         )
+        self.assertEqual(equipment_b.project_id, self.project1)
+        equipment_b.action_create_project()
+        self.assertEqual(equipment_b.project_id, self.project1)
 
     def test_project_equipment_count(self):
+        self.equipment1.action_create_project()
         self.assertEqual(self.project1.equipment_count, 1)
         self.assertEqual(self.equipment1.project_id.equipment_count, 1)
-        self.assertEqual(self.project_demo1.equipment_count, 2)
-        self.assertEqual(self.equipment_demo3.project_id.equipment_count, 1)
+        self.assertEqual(self.project_demo.equipment_count, 2)
+        self.assertEqual(self.equipment_demo.project_id.equipment_count, 1)
 
-    def test_request_onchange_equipment(self):
-        req1 = self.env["maintenance.request"].new({"name": "My test request #1"})
-        self.assertFalse(req1.project_id)
-        req1.equipment_id = self.equipment1
-        req1.onchange_equipment_id()
-        self.assertEqual(req1.project_id, self.equipment1.project_id)
-
-        req2 = self.env["maintenance.request"].new({"name": "My test request #2"})
-        req2.equipment_id = self.equipment2
-        req2.onchange_equipment_id()
-        self.assertFalse(req2.project_id)
+    @users("test-user")
+    def test_request_equipment(self):
+        request_form_1 = Form(self.env["maintenance.request"])
+        request_form_1.name = "My test request #1"
+        self.assertFalse(request_form_1.project_id)
+        request_form_1.equipment_id = self.equipment1
+        self.assertEqual(request_form_1.project_id, self.equipment1.project_id)
+        request_form_2 = Form(self.env["maintenance.request"])
+        request_form_2.name = "My test request #2"
+        request_form_2.equipment_id = self.equipment2
+        self.assertFalse(request_form_2.project_id)
 
     def test_generate_requests(self):
         self.cron.method_direct_trigger()
-
         generated_requests = self.env["maintenance.request"].search(
             [("project_id", "!=", False)]
         )
@@ -79,12 +104,11 @@ def test_generate_requests(self):
             self.assertEqual(req.task_id, req.equipment_id.preventive_default_task_id)
             self.assertEqual(req.project_id.maintenance_request_count, 1)
 
-    def test_action_views(self):
+    def test_project_action_views(self):
         act1 = self.project1.action_view_equipment_ids()
         self.assertEqual(act1["domain"][0][2], self.project1.id)
         self.assertEqual(act1["context"]["default_project_id"], self.project1.id)
         self.assertFalse(act1["context"]["default_create_project_from_equipment"])
-
         act2 = self.project1.action_view_maintenance_request_ids()
         self.assertEqual(act2["domain"][0][2], self.project1.id)
         self.assertEqual(act2["context"]["default_project_id"], self.project1.id)
diff --git a/maintenance_project/views/maintenance_equipment_views.xml b/maintenance_project/views/maintenance_equipment_views.xml
index 554be3b94..3707413f0 100644
--- a/maintenance_project/views/maintenance_equipment_views.xml
+++ b/maintenance_project/views/maintenance_equipment_views.xml
@@ -5,7 +5,7 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_view_search" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='owner_user_id']" position="after">
-                <field name="project_id" />
+                <field name="project_id" groups="project.group_project_user" />
             </xpath>
         </field>
     </record>
@@ -14,7 +14,7 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_view_tree" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='category_id']" position="after">
-                <field name="project_id" />
+                <field name="project_id" groups="project.group_project_user" />
             </xpath>
         </field>
     </record>
@@ -23,10 +23,13 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_view_kanban" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='activity_state']" position="after">
-                <field name="project_id" />
+                <field name="project_id" groups="project.group_project_user" />
             </xpath>
             <xpath expr="//div[hasclass('o_kanban_record_body')]" position="inside">
-                <div t-if="record.project_id.raw_value">
+                <div
+                    t-if="record.project_id.raw_value"
+                    groups="project.group_project_user"
+                >
                     <small>Project: <t t-raw="record.project_id.value" /></small>
                 </div>
             </xpath>
@@ -37,14 +40,24 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='location']" position="after">
-                <field
-                    name="create_project_from_equipment"
-                    attrs="{'invisible': [('id', '!=', False)]}"
-                />
-                <field
-                    name="project_id"
-                    attrs="{'invisible': [('create_project_from_equipment', '=', True), ('id', '=', False)]}"
-                />
+                <field name="project_id" invisible="1" />
+                <label for="project_id" groups="project.group_project_user" />
+                <div>
+                    <field
+                        name="project_id"
+                        groups="project.group_project_user"
+                        class="oe_inline"
+                    />
+                    <button
+                        name="action_create_project"
+                        groups="project.group_project_manager"
+                        type="object"
+                        class="oe_link"
+                        attrs="{'invisible': ['|', ('id', '=', False),('project_id', '!=', False)]}"
+                    >
+                        <span class="fa fa-plus" /><span> Create project</span>
+                    </button>
+                </div>
             </xpath>
             <xpath expr="//group[@name='maintenance']" position="after">
                 <group name="project_task">
@@ -52,6 +65,7 @@
                         name="preventive_default_task_id"
                         domain="[('project_id', '=', project_id)]"
                         context="{'default_project_id': project_id}"
+                        groups="project.group_project_user"
                     />
                 </group>
             </xpath>
diff --git a/maintenance_project/views/maintenance_request_views.xml b/maintenance_project/views/maintenance_request_views.xml
index dadd5c9f6..a3f489bf1 100644
--- a/maintenance_project/views/maintenance_request_views.xml
+++ b/maintenance_project/views/maintenance_request_views.xml
@@ -5,7 +5,7 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_request_view_search" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='maintenance_team_id']" position="after">
-                <field name="project_id" />
+                <field name="project_id" groups="project.group_project_user" />
             </xpath>
         </field>
     </record>
@@ -14,7 +14,7 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_request_view_tree" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='category_id']" position="after">
-                <field name="project_id" />
+                <field name="project_id" groups="project.group_project_user" />
             </xpath>
         </field>
     </record>
@@ -23,10 +23,13 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_request_view_kanban" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='activity_state']" position="after">
-                <field name="project_id" />
+                <field name="project_id" groups="project.group_project_user" />
             </xpath>
             <xpath expr="//div[hasclass('o_kanban_record_body')]" position="inside">
-                <div t-if="record.project_id.raw_value">
+                <div
+                    t-if="record.project_id.raw_value"
+                    groups="project.group_project_user"
+                >
                     <small>Project: <t t-raw="record.project_id.value" /></small>
                 </div>
             </xpath>
@@ -37,11 +40,14 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_request_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='priority']" position="after">
-                <field name="project_id" />
+                <field name="project_id" invisible="1" />
+                <field name="project_id" groups="project.group_project_user" />
+                <field name="task_id" invisible="1" />
                 <field
                     name="task_id"
                     domain="[('project_id', '=', project_id)]"
                     context="{'default_project_id': project_id}"
+                    groups="project.group_project_user"
                 />
             </xpath>
         </field>
diff --git a/maintenance_project/views/project_project_views.xml b/maintenance_project/views/project_project_views.xml
index e960b9115..75764358c 100644
--- a/maintenance_project/views/project_project_views.xml
+++ b/maintenance_project/views/project_project_views.xml
@@ -5,14 +5,21 @@
         <field name="inherit_id" ref="project.view_project_kanban" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='rating_status']" position="after">
-                <field name="equipment_count" />
-                <field name="maintenance_request_count" />
+                <field
+                    name="equipment_count"
+                    groups="maintenance.group_equipment_manager"
+                />
+                <field
+                    name="maintenance_request_count"
+                    groups="maintenance.group_equipment_manager"
+                />
             </xpath>
             <xpath expr="//div[hasclass('o_project_kanban_boxes')]" position="inside">
                 <a
                     class="o_project_kanban_box"
                     name="action_view_equipment_ids"
                     type="object"
+                    groups="maintenance.group_equipment_manager"
                 >
                     <div>
                         <span class="o_value">
@@ -25,6 +32,7 @@
                     class="o_project_kanban_box"
                     name="action_view_maintenance_request_ids"
                     type="object"
+                    groups="maintenance.group_equipment_manager"
                 >
                     <div>
                         <span class="o_value">
@@ -46,6 +54,7 @@
                     name="action_view_equipment_ids"
                     type="object"
                     icon="fa-ticket"
+                    groups="maintenance.group_equipment_manager"
                 >
                     <field
                         string="Equipments"
@@ -58,6 +67,7 @@
                     name="action_view_maintenance_request_ids"
                     type="object"
                     icon="fa-tasks"
+                    groups="maintenance.group_equipment_manager"
                 >
                     <field
                         string="Requests"
diff --git a/maintenance_timesheet/models/maintenance_equipment.py b/maintenance_timesheet/models/maintenance_equipment.py
index a5753ba03..4b63546b6 100644
--- a/maintenance_timesheet/models/maintenance_equipment.py
+++ b/maintenance_timesheet/models/maintenance_equipment.py
@@ -7,7 +7,7 @@
 class MaintenanceEquipment(models.Model):
     _inherit = "maintenance.equipment"
 
-    def _prepare_project_from_equipment_values(self, values):
-        data = super()._prepare_project_from_equipment_values(values)
+    def _prepare_project_from_equipment_values(self):
+        data = super()._prepare_project_from_equipment_values()
         data["allow_timesheets"] = True
         return data
diff --git a/maintenance_timesheet/tests/test_maintenance_timesheet.py b/maintenance_timesheet/tests/test_maintenance_timesheet.py
index 9760606ac..a8a4c6015 100644
--- a/maintenance_timesheet/tests/test_maintenance_timesheet.py
+++ b/maintenance_timesheet/tests/test_maintenance_timesheet.py
@@ -102,7 +102,6 @@ def test_action_view_timesheet_ids(self):
         self.assertFalse(act1["context"]["readonly_employee_id"])
 
     def test_prepare_project_from_equipment_values(self):
-        data = self.env["maintenance.equipment"]._prepare_project_from_equipment_values(
-            {"name": "my name"}
-        )
-        self.assertTrue(data["allow_timesheets"])
+        equipment = self.env["maintenance.equipment"].create({"name": "Test equipment"})
+        equipment.action_create_project()
+        self.assertTrue(equipment.project_id.allow_timesheets)