diff --git a/.config/dictionary.txt b/.config/dictionary.txt
index e4a13ef5..83628a65 100644
--- a/.config/dictionary.txt
+++ b/.config/dictionary.txt
@@ -15,6 +15,7 @@ OAUTHBEARER
 Oliveira
 PYTHONUNBUFFERED
 Passw
+Tompage
 akasurde
 alertmanager
 alinabuzachis
diff --git a/.config/manifest.txt b/.config/manifest.txt
index 13912d26..6e5480bf 100644
--- a/.config/manifest.txt
+++ b/.config/manifest.txt
@@ -85,6 +85,8 @@ plugins/modules/event_stream.py
 plugins/modules/event_stream_info.py
 plugins/modules/project.py
 plugins/modules/project_info.py
+plugins/modules/role_team_assignment.py
+plugins/modules/role_user_assignment.py
 plugins/modules/rulebook_activation.py
 plugins/modules/rulebook_activation_copy.py
 plugins/modules/rulebook_activation_info.py
diff --git a/meta/runtime.yml b/meta/runtime.yml
index 23c68994..f80fccad 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -17,6 +17,8 @@ action_groups:
     - event_stream_info
     - project
     - project_info
+    - role_team_assignment
+    - role_user_assignment
     - rulebook_info
     - rulebook_activation
     - rulebook_activation_copy
diff --git a/plugins/module_utils/controller.py b/plugins/module_utils/controller.py
index d66afbe1..3675b9b7 100644
--- a/plugins/module_utils/controller.py
+++ b/plugins/module_utils/controller.py
@@ -17,7 +17,11 @@
 
 
 class Controller:
-    IDENTITY_FIELDS = {"users": "username"}
+    IDENTITY_FIELDS = {
+        "users": "username",
+        "role_user_assignments": "role_definition",
+        "role_team_assignments": "role_definition",
+    }
     ENCRYPTED_STRING = "$encrypted$"
 
     def __init__(self, client: Client, module: AnsibleModule) -> None:
@@ -348,7 +352,7 @@ def create_or_update_if_needed(
         )
 
     def delete_if_needed(
-        self, existing_item: dict[str, Any], endpoint: str
+        self, existing_item: Optional[dict[str, Any]], endpoint: str
     ) -> dict[str, Any]:
         if not existing_item:
             return self.result
diff --git a/plugins/modules/role_team_assignment.py b/plugins/modules/role_team_assignment.py
new file mode 100644
index 00000000..3d6717fe
--- /dev/null
+++ b/plugins/modules/role_team_assignment.py
@@ -0,0 +1,166 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+
+DOCUMENTATION = r"""
+---
+module: role_team_assignment
+author: "Tom Page (@Tompage1994)"
+short_description: Gives a team permission to a resource or an organization.
+description:
+    - This module allows the user to give a team permission to a resource or an organization.
+    - After creation, the assignment cannot be edited, but can be deleted to remove those permissions.
+version_added: 2.7.0
+options:
+    role_definition:
+      description:
+          - The name of the role definition to assign to the team.
+      required: True
+      type: str
+    object_id:
+      description:
+          - Primary key of the object this assignment applies to.
+      type: int
+    team:
+      description:
+          - The name of the team to assign to the object.
+      type: str
+    object_ansible_id:
+      description:
+          - Resource id of the object this role applies to. Alternative to the object_id field.
+      type: str
+    team_ansible_id:
+      description:
+        - Resource id of the team who will receive permissions from this assignment. Alternative to team field.
+      type: str
+    state:
+      description:
+        - Desired state of the resource.
+      choices: ["present", "absent"]
+      default: "present"
+      type: str
+extends_documentation_fragment:
+  - ansible.eda.eda_controller.auths
+"""
+
+
+EXAMPLES = r"""
+- name: Give Administrators organization admin role for org 1
+  ansible.eda.role_team_assignment:
+    role_definition: Organization Admin
+    object_id: 1
+    team: Administrators
+    state: present
+...
+"""
+
+from ansible.module_utils.basic import AnsibleModule
+
+from ..module_utils.arguments import AUTH_ARGSPEC
+from ..module_utils.client import Client
+from ..module_utils.controller import Controller
+from ..module_utils.errors import EDAError
+
+
+def main() -> None:
+    # Any additional arguments that are not fields of the item can be added here
+    argument_spec = dict(
+        team=dict(required=False, type="str"),
+        object_id=dict(required=False, type="int"),
+        role_definition=dict(required=True, type="str"),
+        object_ansible_id=dict(required=False, type="str"),
+        team_ansible_id=dict(required=False, type="str"),
+        state=dict(default="present", choices=["present", "absent"]),
+    )
+
+    argument_spec.update(AUTH_ARGSPEC)
+
+    module = AnsibleModule(
+        argument_spec=argument_spec,
+        supports_check_mode=True,
+        mutually_exclusive=[
+            ("team", "team_ansible_id"),
+            ("object_id", "object_ansible_id"),
+        ],
+        required_one_of=[
+            ("team", "team_ansible_id"),
+            ("object_id", "object_ansible_id"),
+        ],
+    )
+
+    client = Client(
+        host=module.params.get("controller_host"),
+        username=module.params.get("controller_username"),
+        password=module.params.get("controller_password"),
+        timeout=module.params.get("request_timeout"),
+        validate_certs=module.params.get("validate_certs"),
+    )
+
+    team_param = module.params.get("team")
+    object_id = module.params.get("object_id")
+    role_definition_str = module.params.get("role_definition")
+    object_ansible_id = module.params.get("object_ansible_id")
+    team_ansible_id = module.params.get("team_ansible_id")
+    state = module.params.get("state")
+
+    controller = Controller(client, module)
+
+    try:
+        role_definition = controller.get_exactly_one(
+            "role_definitions", name=role_definition_str
+        )
+        team = controller.get_exactly_one("teams", name=team_param)
+    except EDAError as eda_err:
+        module.fail_json(msg=str(eda_err))
+
+    new_item = {"role_definition": role_definition["id"]}
+
+    if object_id is not None:
+        new_item["object_id"] = object_id
+    if team is not None:
+        new_item["team"] = team["id"] if team else None
+    if object_ansible_id is not None:
+        new_item["object_ansible_id"] = object_ansible_id
+    if team_ansible_id is not None:
+        new_item["team_ansible_id"] = team_ansible_id
+
+    try:
+        assignment_list = controller.get_one_or_many(
+            "role_team_assignments", None, **{"data": new_item}
+        )
+        assignment = assignment_list[0] if len(assignment_list) == 1 else None
+    except EDAError as eda_err:
+        module.fail_json(msg=str(eda_err))
+
+    if state == "absent":
+        try:
+            ret = controller.delete_if_needed(
+                assignment, endpoint="role_team_assignments"
+            )
+        except EDAError as eda_err:
+            module.fail_json(msg=str(eda_err))
+
+    elif state == "present" and assignment is None:
+        try:
+            ret = controller.create_if_needed(
+                new_item=new_item,
+                endpoint="role_team_assignments",
+                item_type="role_team_assignment",
+            )
+        except EDAError as eda_err:
+            module.fail_json(msg=str(eda_err))
+
+    else:
+        ret = {"changed": False}
+
+    module.exit_json(**ret)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/plugins/modules/role_user_assignment.py b/plugins/modules/role_user_assignment.py
new file mode 100644
index 00000000..19bbad58
--- /dev/null
+++ b/plugins/modules/role_user_assignment.py
@@ -0,0 +1,166 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+
+DOCUMENTATION = r"""
+---
+module: role_user_assignment
+author: "Tom Page (@Tompage1994)"
+short_description: Gives a user permission to a resource or an organization.
+description:
+    - This module allows the user to give a user permission to a resource or an organization.
+    - After creation, the assignment cannot be edited, but can be deleted to remove those permissions.
+version_added: 2.7.0
+options:
+    role_definition:
+      description:
+          - The name of the role definition to assign to the user.
+      required: True
+      type: str
+    object_id:
+      description:
+          - Primary key of the object this assignment applies to.
+      type: int
+    user:
+      description:
+          - The name of the user to assign to the object.
+      type: str
+    object_ansible_id:
+      description:
+          - Resource id of the object this role applies to. Alternative to the object_id field.
+      type: str
+    user_ansible_id:
+      description:
+          - Resource id of the user who will receive permissions from this assignment. Alternative to user field.
+      type: str
+    state:
+      description:
+        - Desired state of the resource.
+      choices: ["present", "absent"]
+      default: "present"
+      type: str
+extends_documentation_fragment:
+  - ansible.eda.eda_controller.auths
+"""
+
+
+EXAMPLES = r"""
+- name: Give Administrators organization admin role for org 1
+  ansible.eda.role_user_assignment:
+    role_definition: Organization Admin
+    object_id: 1
+    user: Administrators
+    state: present
+...
+"""
+
+from ansible.module_utils.basic import AnsibleModule
+
+from ..module_utils.arguments import AUTH_ARGSPEC
+from ..module_utils.client import Client
+from ..module_utils.controller import Controller
+from ..module_utils.errors import EDAError
+
+
+def main() -> None:
+    # Any additional arguments that are not fields of the item can be added here
+    argument_spec = dict(
+        user=dict(required=False, type="str"),
+        object_id=dict(required=False, type="int"),
+        role_definition=dict(required=True, type="str"),
+        object_ansible_id=dict(required=False, type="str"),
+        user_ansible_id=dict(required=False, type="str"),
+        state=dict(default="present", choices=["present", "absent"]),
+    )
+
+    argument_spec.update(AUTH_ARGSPEC)
+
+    module = AnsibleModule(
+        argument_spec=argument_spec,
+        supports_check_mode=True,
+        mutually_exclusive=[
+            ("user", "user_ansible_id"),
+            ("object_id", "object_ansible_id"),
+        ],
+        required_one_of=[
+            ("user", "user_ansible_id"),
+            ("object_id", "object_ansible_id"),
+        ],
+    )
+
+    client = Client(
+        host=module.params.get("controller_host"),
+        username=module.params.get("controller_username"),
+        password=module.params.get("controller_password"),
+        timeout=module.params.get("request_timeout"),
+        validate_certs=module.params.get("validate_certs"),
+    )
+
+    user_param = module.params.get("user")
+    object_id = module.params.get("object_id")
+    role_definition_str = module.params.get("role_definition")
+    object_ansible_id = module.params.get("object_ansible_id")
+    user_ansible_id = module.params.get("user_ansible_id")
+    state = module.params.get("state")
+
+    controller = Controller(client, module)
+
+    try:
+        role_definition = controller.get_exactly_one(
+            "role_definitions", name=role_definition_str
+        )
+        user = controller.get_exactly_one("users", name=user_param)
+    except EDAError as eda_err:
+        module.fail_json(msg=str(eda_err))
+
+    new_item = {"role_definition": role_definition["id"]}
+
+    if object_id is not None:
+        new_item["object_id"] = object_id
+    if user is not None:
+        new_item["user"] = user["id"] if user else None
+    if object_ansible_id is not None:
+        new_item["object_ansible_id"] = object_ansible_id
+    if user_ansible_id is not None:
+        new_item["user_ansible_id"] = user_ansible_id
+
+    try:
+        assignment_list = controller.get_one_or_many(
+            "role_user_assignments", None, **{"data": new_item}
+        )
+        assignment = assignment_list[0] if len(assignment_list) == 1 else None
+    except EDAError as eda_err:
+        module.fail_json(msg=str(eda_err))
+
+    if state == "absent":
+        try:
+            ret = controller.delete_if_needed(
+                assignment, endpoint="role_user_assignments"
+            )
+        except EDAError as eda_err:
+            module.fail_json(msg=str(eda_err))
+
+    elif state == "present" and assignment is None:
+        try:
+            ret = controller.create_if_needed(
+                new_item=new_item,
+                endpoint="role_user_assignments",
+                item_type="role_user_assignment",
+            )
+        except EDAError as eda_err:
+            module.fail_json(msg=str(eda_err))
+
+    else:
+        ret = {"changed": False}
+
+    module.exit_json(**ret)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/integration/targets/role_team_assignment/tasks/main.yml b/tests/integration/targets/role_team_assignment/tasks/main.yml
new file mode 100644
index 00000000..037730c2
--- /dev/null
+++ b/tests/integration/targets/role_team_assignment/tasks/main.yml
@@ -0,0 +1,101 @@
+---
+- name: role_team_assignment integration tests
+  module_defaults:
+    group/ansible.eda.eda:
+      aap_hostname: "{{ aap_hostname }}"
+      aap_username: "{{ aap_username }}"
+      aap_password: "{{ aap_password }}"
+      aap_validate_certs: "{{ aap_validate_certs }}"
+  block:
+    - name: Set the team to use for the test
+      set_fact:
+        team_name: "TBC"  # A team will need to exist in the Platform instance for this to work.
+
+    # CREATE
+    - name: Create role_team_assignment in check mode
+      ansible.eda.role_team_assignment:
+        state: present
+        team: "{{ team_name }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+      check_mode: true
+      register: _result
+
+    - name: Check role_team_assignment creation in check mode
+      assert:
+        that:
+          - _result.changed
+
+    - name: Create role_team_assignment
+      ansible.eda.role_team_assignment:
+        state: present
+        team: "{{ team_name }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+      register: _result
+
+    - name: Check role_team_assignment creation
+      assert:
+        that:
+          - _result.changed
+
+    - name: Create role_team_assignment again
+      ansible.eda.role_team_assignment:
+        state: present
+        team: "{{ team_name }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+      register: _result
+
+    - name: Check role_team_assignment is not created again
+      assert:
+        that:
+          - not _result.changed
+
+    # DELETE
+    - name: Delete operation type without required parameter
+      ansible.eda.role_team_assignment:
+        state: absent
+      ignore_errors: true
+      register: _result
+
+    - name: Check if role_team_assignment name is required
+      assert:
+        that:
+          - _result.failed
+          - "'missing required arguments: role_definition' in _result.msg"
+
+    - name: Delete non-existing role_team_assignment in check mode
+      ansible.eda.role_team_assignment:
+        team: "{{ team_name }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 2
+        state: absent
+      check_mode: true
+      register: _result
+
+    - name: Check if delete non-existing role_team_assignment in check mode
+      assert:
+        that:
+          - not _result.changed
+
+    - name: Delete role_team_assignment
+      ansible.eda.role_team_assignment:
+        team: "{{ team_name }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+        state: absent
+      register: _result
+
+    - name: Check if delete non-existing role_team_assignment
+      assert:
+        that:
+          - _result.changed
+  always:
+    - name: Clean up - role_team_assignment
+      ansible.eda.role_team_assignment:
+        team: "{{ team_name }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 2
+        state: absent
+      ignore_errors: true
diff --git a/tests/integration/targets/role_user_assignment/tasks/main.yml b/tests/integration/targets/role_user_assignment/tasks/main.yml
new file mode 100644
index 00000000..e633ca46
--- /dev/null
+++ b/tests/integration/targets/role_user_assignment/tasks/main.yml
@@ -0,0 +1,97 @@
+---
+- name: role_team_assignment integration tests
+  module_defaults:
+    group/ansible.eda.eda:
+      aap_hostname: "{{ aap_hostname }}"
+      aap_username: "{{ aap_username }}"
+      aap_password: "{{ aap_password }}"
+      aap_validate_certs: "{{ aap_validate_certs }}"
+  block:
+    # CREATE
+    - name: Create role_user_assignment in check mode
+      ansible.eda.role_user_assignment:
+        state: present
+        user: "{{ aap_username }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+      check_mode: true
+      register: _result
+
+    - name: Check role_user_assignment creation in check mode
+      assert:
+        that:
+          - _result.changed
+
+    - name: Create role_user_assignment
+      ansible.eda.role_user_assignment:
+        state: present
+        user: "{{ aap_username }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+      register: _result
+
+    - name: Check role_user_assignment creation
+      assert:
+        that:
+          - _result.changed
+
+    - name: Create role_user_assignment again
+      ansible.eda.role_user_assignment:
+        state: present
+        user: "{{ aap_username }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+      register: _result
+
+    - name: Check role_user_assignment is not created again
+      assert:
+        that:
+          - not _result.changed
+
+    # DELETE
+    - name: Delete operation type without required parameter
+      ansible.eda.role_user_assignment:
+        state: absent
+      ignore_errors: true
+      register: _result
+
+    - name: Check if role_user_assignment name is required
+      assert:
+        that:
+          - _result.failed
+          - "'missing required arguments: role_definition' in _result.msg"
+
+    - name: Delete non-existing role_user_assignment in check mode
+      ansible.eda.role_user_assignment:
+        user: "{{ aap_username }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 2
+        state: absent
+      check_mode: true
+      register: _result
+
+    - name: Check if delete non-existing role_user_assignment in check mode
+      assert:
+        that:
+          - not _result.changed
+
+    - name: Delete role_user_assignment
+      ansible.eda.role_user_assignment:
+        user: "{{ aap_username }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 1
+        state: absent
+      register: _result
+
+    - name: Check if delete non-existing role_user_assignment
+      assert:
+        that:
+          - _result.changed
+  always:
+    - name: Clean up - role_user_assignment
+      ansible.eda.role_user_assignment:
+        user: "{{ aap_username }}"
+        role_definition: Organization Eda Credential Admin
+        object_id: 2
+        state: absent
+      ignore_errors: true