diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index 9180d7fc02..63bb1c8a75 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -376,6 +376,7 @@ module.exports = {
                 "docs/api/tutorials/creating-datasets",
                 "docs/api/tutorials/creating-tags",
                 "docs/api/tutorials/creating-terms",
+                "docs/api/tutorials/creating-users-and-groups",
               ],
             },
             {
diff --git a/docs/api/tutorials/creating-users-and-groups.md b/docs/api/tutorials/creating-users-and-groups.md
new file mode 100644
index 0000000000..27e2ea824b
--- /dev/null
+++ b/docs/api/tutorials/creating-users-and-groups.md
@@ -0,0 +1,179 @@
+# Creating or Updating Users And Groups
+
+## Why Would You Create or Update Users and Groups?
+Users and groups are essential for managing ownership of data. 
+By creating or updating user accounts and assigning them to appropriate groups, administrators can ensure that the right people can access the data they need to do their jobs. 
+This helps to avoid confusion or conflicts over who is responsible for specific datasets and can improve the overall effectiveness. 
+
+### Goal Of This Guide
+This guide will show you how to create or update users and groups.
+
+## Pre-requisites
+For this tutorial, you need to deploy DataHub Quickstart and ingest sample data. 
+For detailed information, please refer to [Preparing Your Local DataHub Environment](/docs/api/tutorials/references/prepare-datahub.md).
+
+:::note
+In this guide, ingesting sample data is optional.
+:::
+
+## Upsert Users And Groups With Datahub CLI
+
+You can ingest users and groups with `yaml` using Datahub CLI. 
+
+### Upsert User
+
+Save this `user.yaml` as a local file.
+
+```yaml
+- id: bar@acryl.io
+  first_name: The
+  last_name: Bar
+  email: bar@acryl.io
+  slack: "@the_bar_raiser"
+  description: "I like raising the bar higher"
+  groups:
+    - foogroup@acryl.io
+- id: datahub
+  slack: "@datahubproject"
+  phone: "1-800-GOT-META"
+  description: "The DataHub Project"
+  picture_link: "https://raw.githubusercontent.com/datahub-project/datahub/master/datahub-web-react/src/images/datahub-logo-color-stable.svg"
+```
+
+Execute the following CLI command to ingest user data. 
+Since the user datahub already exists in the sample data, any updates made to the user information will overwrite the existing data.
+```
+datahub user upsert -f user.yaml
+```
+
+If you see the following logs, the operation was successful:
+```shell
+Update succeeded for urn urn:li:corpuser:bar@acryl.io.
+Update succeeded for urn urn:li:corpuser:datahub.
+```
+
+### Upsert Group
+
+Save this `group.yaml` as a local file. Note that the group includes a list of users who are admins (these will be marked as owners) and members.
+Within these lists, you can refer to the users by their ids or their urns, and can additionally specify their metadata inline within the group description itself. See the example below to understand how this works and feel free to make modifications to this file locally to see the effects of your changes in your local DataHub instance.
+
+```yaml
+id: foogroup@acryl.io
+display_name: Foo Group
+admins:
+  - datahub
+members:
+  - bar@acryl.io # refer to a user either by id or by urn
+  - id: joe@acryl.io # inline specification of user
+    slack: "@joe_shmoe"
+    display_name: "Joe's Hub"
+```
+
+Execute the following CLI command to ingest this group's information. 
+
+```
+datahub group upsert -f group.yaml
+```
+
+If you see the following logs, the operation was successful:
+```shell
+Update succeeded for group urn:li:corpGroup:foogroup@acryl.io.
+```
+
+## Upsert Users And Groups With Python SDK
+
+### Upsert User
+
+The following code creates a user named `The Bar` with urn `urn:li:corpuser:bar@acryl.io`.
+You can refer to the full code in [upsert_user.py](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/examples/library/upsert_user.py).
+
+```python
+import logging
+
+from datahub.api.entities.corpuser.corpuser import CorpUser, CorpUserGenerationConfig
+from datahub.ingestion.graph.client import DataHubGraph, DataHubGraphConfig
+
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO)
+
+user_email = "bar@acryl.io"
+
+user: CorpUser = CorpUser(
+    id=user_email,
+    display_name="The Bar",
+    email=user_email,
+    title="Software Engineer",
+    first_name="The",
+    last_name="Bar",
+    full_name="The Bar",
+)
+
+# Create graph client
+datahub_graph = DataHubGraph(DataHubGraphConfig(server="http://localhost:8080"))
+for event in user.generate_mcp(
+    generation_config=CorpUserGenerationConfig(override_editable=False)
+):
+    datahub_graph.emit(event)
+log.info(f"Upserted user {user.urn}")
+```
+
+### Upsert Group
+
+The following code creates a group called `Foo Group` with group `urn:li:corpgroup:foogroup@acryl.io`.
+You can refer to the full code in [upsert_group.py](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/examples/library/upsert_group.py).
+
+```python
+import logging
+
+from datahub.api.entities.corpgroup.corpgroup import (
+    CorpGroup,
+    CorpGroupGenerationConfig,
+)
+from datahub.ingestion.graph.client import DataHubGraph, DataHubGraphConfig
+from datahub.utilities.urns.corpuser_urn import CorpuserUrn
+
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO)
+
+group_email = "foogroup@acryl.io"
+group = CorpGroup(
+    id=group_email,
+    admins=[str(CorpuserUrn.create_from_id("datahub"))],
+    members=[
+        str(CorpuserUrn.create_from_id("bar@acryl.io")),
+        str(CorpuserUrn.create_from_id("joe@acryl.io")),
+    ],
+    groups=[],
+    display_name="Foo Group",
+    email=group_email,
+    description="Software engineering team",
+    slack="@foogroup",
+)
+
+# Create graph client
+datahub_graph = DataHubGraph(DataHubGraphConfig(server="http://localhost:8080"))
+
+for event in group.generate_mcp(
+    generation_config=CorpGroupGenerationConfig(
+        override_editable=False, datahub_graph=datahub_graph
+    )
+):
+    datahub_graph.emit(event)
+log.info(f"Upserted group {group.urn}")
+```
+
+We're using the `MetdataChangeProposalWrapper` to change entities in this example.
+For more information about the `MetadataChangeProposal`, please refer to [MetadataChangeProposal & MetadataChangeLog Events](/docs/advanced/mcp-mcl.md)
+
+## Expected Outcomes
+
+### User
+You can see the user `The bar` has been created and the user `Datahub` has been updated under `Settings > Access > Users & Groups`
+![user-upserted](../../imgs/apis/tutorials/user-upserted.png)
+
+### Group
+You can see the group `Foo Group` has been created under `Settings > Access > Users & Groups`
+![group-upserted](../../imgs/apis/tutorials/group-upserted.png)
+
+## What's Next?
+Now that you created users and groups, how about adding them as an owner to a dataset? Here's a guide on [how to add an owner on a dataset](/docs/api/tutorials/adding-ownerships.md). 
diff --git a/docs/cli.md b/docs/cli.md
index 8036663b80..f79a1a51d7 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -297,6 +297,55 @@ New Entities Created: {'urn:li:dataset:(urn:li:dataPlatform:hive,warehouse.Sampl
 External Entities Affected: None
 Old Entities Migrated = {'urn:li:dataset:(urn:li:dataPlatform:hive,logging_events,PROD)', 'urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)', 'urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_deleted,PROD)', 'urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD)'}
 ```
+### user
+The `user` command allows you to interact with the User entity. 
+It currently supports the `upsert` operation, which can be used to create a new user or update an existing one. 
+For detailed information, please refer to [Creating Users and Groups with Datahub CLI](/docs/api/tutorials/creating-users-and-groups.md#upsert-users-and-groups-with-datahub-cli).
+
+```shell
+datahub user upsert -f users.yaml
+```
+
+An example of `users.yaml` would look like the following. You can refer to the [bar.user.dhub.yaml](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/examples/cli_usage/user/bar.user.dhub.yaml) file for the complete code.
+```yaml
+- id: bar@acryl.io
+  first_name: The
+  last_name: Bar
+  email: bar@acryl.io
+  slack: "@the_bar_raiser"
+  description: "I like raising the bar higher"
+  groups:
+    - foogroup@acryl.io
+- id: datahub
+  slack: "@datahubproject"
+  phone: "1-800-GOT-META"
+  description: "The DataHub Project"
+  picture_link: "https://raw.githubusercontent.com/datahub-project/datahub/master/datahub-web-react/src/images/datahub-logo-color-stable.svg"
+```
+
+
+### group
+The `group` command allows you to interact with the Group entity.
+It currently supports  the `upsert` operation, which can be used to create a new group or update an existing one with embedded Users. 
+For more information, please refer to [Creating Users and Groups with Datahub CLI](/docs/api/tutorials/creating-users-and-groups.md#upsert-users-and-groups-with-datahub-cli).
+
+```shell
+datahub group upsert -f group.yaml
+```
+
+An example of `group.yaml` would look like the following. You can refer to the [foo.group.dhub.yaml](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/examples/cli_usage/group/foo.group.dhub.yaml) file for the complete code.
+
+```yaml
+id: foogroup@acryl.io
+display_name: Foo Group
+admins:
+  - datahub
+members:
+  - bar@acryl.io # refer to a user either by id or by urn
+  - id: joe@acryl.io # inline specification of user
+    slack: "@joe_shmoe"
+    display_name: "Joe's Hub"
+```
 
 ## Alternate Installation Options
 
diff --git a/docs/imgs/apis/tutorials/group-upserted.png b/docs/imgs/apis/tutorials/group-upserted.png
new file mode 100644
index 0000000000..5283f6273f
Binary files /dev/null and b/docs/imgs/apis/tutorials/group-upserted.png differ
diff --git a/docs/imgs/apis/tutorials/user-upserted.png b/docs/imgs/apis/tutorials/user-upserted.png
new file mode 100644
index 0000000000..38c5bbb9ad
Binary files /dev/null and b/docs/imgs/apis/tutorials/user-upserted.png differ
diff --git a/metadata-ingestion/examples/library/upsert_group.py b/metadata-ingestion/examples/library/upsert_group.py
new file mode 100644
index 0000000000..d48eff2bbe
--- /dev/null
+++ b/metadata-ingestion/examples/library/upsert_group.py
@@ -0,0 +1,37 @@
+import logging
+
+from datahub.api.entities.corpgroup.corpgroup import (
+    CorpGroup,
+    CorpGroupGenerationConfig,
+)
+from datahub.ingestion.graph.client import DataHubGraph, DataHubGraphConfig
+from datahub.utilities.urns.corpuser_urn import CorpuserUrn
+
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO)
+
+group_email = "foogroup@acryl.io"
+group = CorpGroup(
+    id=group_email,
+    admins=[str(CorpuserUrn.create_from_id("datahub"))],
+    members=[
+        str(CorpuserUrn.create_from_id("bar@acryl.io")),
+        str(CorpuserUrn.create_from_id("joe@acryl.io")),
+    ],
+    groups=[],
+    display_name="Foo Group",
+    email=group_email,
+    description="Software engineering team",
+    slack="@foogroup",
+)
+
+# Create graph client
+datahub_graph = DataHubGraph(DataHubGraphConfig(server="http://localhost:8080"))
+
+for event in group.generate_mcp(
+    generation_config=CorpGroupGenerationConfig(
+        override_editable=False, datahub_graph=datahub_graph
+    )
+):
+    datahub_graph.emit(event)
+log.info(f"Upserted group {group.urn}")
diff --git a/metadata-ingestion/examples/library/upsert_user.py b/metadata-ingestion/examples/library/upsert_user.py
new file mode 100644
index 0000000000..8b26bba0f3
--- /dev/null
+++ b/metadata-ingestion/examples/library/upsert_user.py
@@ -0,0 +1,27 @@
+import logging
+
+from datahub.api.entities.corpuser.corpuser import CorpUser, CorpUserGenerationConfig
+from datahub.ingestion.graph.client import DataHubGraph, DataHubGraphConfig
+
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO)
+
+user_email = "bar@acryl.io"
+
+user: CorpUser = CorpUser(
+    id=user_email,
+    display_name="The Bar",
+    email=user_email,
+    title="Software Engineer",
+    first_name="The",
+    last_name="Bar",
+    full_name="The Bar",
+)
+
+# Create graph client
+datahub_graph = DataHubGraph(DataHubGraphConfig(server="http://localhost:8080"))
+for event in user.generate_mcp(
+    generation_config=CorpUserGenerationConfig(override_editable=False)
+):
+    datahub_graph.emit(event)
+log.info(f"Upserted user {user.urn}")