diff --git a/hr_operating_unit/__manifest__.py b/hr_operating_unit/__manifest__.py
index 6fb16022d5..b183d48310 100644
--- a/hr_operating_unit/__manifest__.py
+++ b/hr_operating_unit/__manifest__.py
@@ -10,7 +10,8 @@
     "depends": ["hr", "operating_unit"],
     "data": [
         "security/security.xml",
-        "views/hr_employee.xml",
+        "views/hr_department_views.xml",
+        "views/hr_employee_views.xml",
     ],
     "installable": True,
 }
diff --git a/hr_operating_unit/models/__init__.py b/hr_operating_unit/models/__init__.py
index 297b40f34f..c6074f5ad0 100644
--- a/hr_operating_unit/models/__init__.py
+++ b/hr_operating_unit/models/__init__.py
@@ -1,4 +1,5 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+from . import hr_department
 from . import hr_employee_base
 from . import hr_operating_unit
diff --git a/hr_operating_unit/models/hr_department.py b/hr_operating_unit/models/hr_department.py
new file mode 100644
index 0000000000..f5b655463b
--- /dev/null
+++ b/hr_operating_unit/models/hr_department.py
@@ -0,0 +1,13 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class Department(models.Model):
+    _inherit = "hr.department"
+
+    operating_unit_id = fields.Many2one(
+        comodel_name="operating.unit",
+        string="Operating Unit",
+        default=lambda self: (self.env["res.users"].operating_unit_default_get()),
+    )
diff --git a/hr_operating_unit/models/hr_operating_unit.py b/hr_operating_unit/models/hr_operating_unit.py
index 985d792f07..3f0c6d1220 100644
--- a/hr_operating_unit/models/hr_operating_unit.py
+++ b/hr_operating_unit/models/hr_operating_unit.py
@@ -7,9 +7,14 @@ class OperatingUnit(models.Model):
     _inherit = "operating.unit"
 
     employee_ids = fields.Many2many(
-        "hr.employee",
-        "operating_unit_employees_rel",
-        "operating_unit_id",
-        "employee_id",
-        "Employees Allowed",
+        comodel_name="hr.employee",
+        relation="operating_unit_employees_rel",
+        column1="operating_unit_id",
+        column2="employee_id",
+        string="Employees Allowed",
+    )
+    department_ids = fields.One2many(
+        comodel_name="hr.department",
+        inverse_name="operating_unit_id",
+        string="Departments",
     )
diff --git a/hr_operating_unit/readme/CONTRIBUTORS.rst b/hr_operating_unit/readme/CONTRIBUTORS.rst
index 031666432a..ceddb7d9bf 100644
--- a/hr_operating_unit/readme/CONTRIBUTORS.rst
+++ b/hr_operating_unit/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Gonzalo González Domínguez <meigallo@meigallodixital.com>
 * Murtaza Mithaiwala <mmithaiwala@opensourceintegrators.com>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
diff --git a/hr_operating_unit/readme/DESCRIPTION.rst b/hr_operating_unit/readme/DESCRIPTION.rst
index 31fc8900ba..6781bb45c0 100644
--- a/hr_operating_unit/readme/DESCRIPTION.rst
+++ b/hr_operating_unit/readme/DESCRIPTION.rst
@@ -1,6 +1,6 @@
 This module introduces the following features:
 
-* Adds the Operating Unit (OU) to the Employee.
+* Adds the Operating Unit (OU) to the Employee/Department.
 
 * The Employees's default Operating Unit (OU) is proposed at the time of creation
   getting it from the logged user.
diff --git a/hr_operating_unit/readme/USAGE.rst b/hr_operating_unit/readme/USAGE.rst
index c22c0a5d4e..0899f084be 100644
--- a/hr_operating_unit/readme/USAGE.rst
+++ b/hr_operating_unit/readme/USAGE.rst
@@ -1 +1 @@
-Add the operating unit to Employee
+Add the operating unit to Employee/Department
diff --git a/hr_operating_unit/security/security.xml b/hr_operating_unit/security/security.xml
index b8a39f2320..90a733581a 100644
--- a/hr_operating_unit/security/security.xml
+++ b/hr_operating_unit/security/security.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
+    <record id="ir_rule_hr_department_allowed_operating_units" model="ir.rule">
+        <field name="model_id" ref="hr.model_hr_department" />
+        <field name="domain_force">['|',
+            ('operating_unit_id', '=', False),
+            ('operating_unit_id', 'in', user.operating_unit_ids.ids)]
+        </field>
+        <field name="name">Department from allowed operating units</field>
+        <field eval="0" name="perm_unlink" />
+        <field eval="0" name="perm_write" />
+        <field eval="1" name="perm_read" />
+        <field eval="0" name="perm_create" />
+        <field name="global" eval="True" />
+    </record>
+
     <record id="ir_rule_hr_allowed_operating_units" model="ir.rule">
         <field name="model_id" ref="hr.model_hr_employee" />
         <field
diff --git a/hr_operating_unit/views/hr_department_views.xml b/hr_operating_unit/views/hr_department_views.xml
new file mode 100644
index 0000000000..f47b16aa46
--- /dev/null
+++ b/hr_operating_unit/views/hr_department_views.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_department_form" model="ir.ui.view">
+        <field name="model">hr.department</field>
+        <field name="inherit_id" ref="hr.view_department_form" />
+        <field name="arch" type="xml">
+            <field name="parent_id" position="after">
+                <field
+                    name="operating_unit_id"
+                    options="{'no_create': True}"
+                    domain="[('company_id','=', company_id)]"
+                    groups="operating_unit.group_multi_operating_unit"
+                />
+            </field>
+        </field>
+    </record>
+    <record id="view_department_tree" model="ir.ui.view">
+        <field name="model">hr.department</field>
+        <field name="inherit_id" ref="hr.view_department_tree" />
+        <field name="arch" type="xml">
+            <field name="parent_id" position="after">
+                <field
+                    name="operating_unit_id"
+                    groups="operating_unit.group_multi_operating_unit"
+                    optional="hide"
+                />
+            </field>
+        </field>
+    </record>
+    <record id="view_department_filter" model="ir.ui.view">
+        <field name="model">hr.department</field>
+        <field name="inherit_id" ref="hr.view_department_filter" />
+        <field name="arch" type="xml">
+            <field name="manager_id" position="after">
+                <field name="operating_unit_id" />
+            </field>
+            <filter name="inactive" position="after">
+                <filter
+                    string="Operating Unit"
+                    name="operating_unit_id"
+                    context="{'group_by': 'operating_unit_id'}"
+                />
+            </filter>
+        </field>
+    </record>
+</odoo>
diff --git a/hr_operating_unit/views/hr_employee.xml b/hr_operating_unit/views/hr_employee_views.xml
similarity index 97%
rename from hr_operating_unit/views/hr_employee.xml
rename to hr_operating_unit/views/hr_employee_views.xml
index d0f54d0069..0de0306e82 100644
--- a/hr_operating_unit/views/hr_employee.xml
+++ b/hr_operating_unit/views/hr_employee_views.xml
@@ -30,7 +30,6 @@
             <field name="company_id" position="after">
                 <field
                     name="operating_unit_ids"
-                    domain="[('user_ids', 'in', uid)]"
                     groups="operating_unit.group_multi_operating_unit"
                     widget="many2many_tags"
                     options="{'no_create': True}"