diff --git a/docs/platform/howto/manage-org-vpc-peering-aws.md b/docs/platform/howto/manage-org-vpc-peering-aws.md
index bd25851b..79672db5 100644
--- a/docs/platform/howto/manage-org-vpc-peering-aws.md
+++ b/docs/platform/howto/manage-org-vpc-peering-aws.md
@@ -3,113 +3,8 @@ title: Manage organization VPC peering with AWS
 sidebar_label: Peer org VPCs with AWS
 ---
 
-import ConsoleLabel from "@site/src/components/ConsoleIcons";
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
+import VpcPeeringAws from "@site/static/includes/manage-vpc-peering-aws.md"
 
-<!--
-Set up or delete an organization-wide VPC in the Aiven Platform. Enable new Aiven projects in the organization VPC or migrate existing Aiven projects to the organization VPC. Access resources within the organization VPC from the public internet.
--->
-## Prerequisites
+Set up a peering connection between your Aiven organization VPC and an AWS VPC.
 
-- [Super admin role](/docs/platform/howto/make-super-admin) to manage organization VPCs
-- Two VPCs to be peered: an
-  [organization VPC](/docs/platform/howto/manage-organization-vpc#create-an-organization-vpc)
-  in Aiven and a VPC in your AWS account
-- One of the following tools for VPC peering operations:
-  - [Aiven Console](https://console.aiven.io/)
-  - [Aiven CLI](/docs/tools/cli)
-  - [Aiven API](/docs/tools/api)
-
-## Create a peering connection
-
-### Collect data in the AWS Console
-
-1. Log in to the [AWS Management Console](https://console.aws.amazon.com) and go to your
-   profile information.
-1. Find and save your account ID.
-1. Go to the VPC service: **All services** > **Networking & Content Delivery** > **VPC**
-   \> **Your VPCs**.
-1. Find a VPC to peer and save its ID.
-1. Find and save a cloud region that the VPC is located in.
-
-### Create a peering in Aiven
-
-Create an organization VPC peering connection using a tool of your choice:
-
-<Tabs groupId="group1">
-<TabItem value="console" label="Aiven Console" default>
-
-1. Log in to the [Aiven Console](https://console.aiven.io/), and click **Admin** in the
-   top navigation bar.
-1. Click <ConsoleLabel name="organizationvpcs"/> in the sidebar.
-1. On the **Organization VPCs** page, select an organization VPC to peer.
-1. On the **Organization VPC details** page, click **Add peering connection**.
-1. In the **Add peering connection** window:
-   1. Enter the following:
-      - **AWS account ID**
-      - **AWS VPC region**
-      - **AWS VPC ID**
-   1. Click **Add peering connection**.
-
-### Accept the peering request in the AWS Console
-
-1. Log in to the [AWS Management Console](https://console.aws.amazon.com), and go to the
-   VPC service (**All services** > **Networking & Content Delivery** > **VPC**).
-1. Click **Peering connections** in the sidebar.
-1. Find and select the peering request from Aiven, and  click **Actions** > **Accept request**.
-1. Create or update your AWS route tables to match your Aiven CIDR settings.
-
-</TabItem>
-<TabItem value="cli" label="Aiven CLI">
-
-</TabItem>
-<TabItem value="api" label="Aiven API">
-
-</TabItem>
-</Tabs>
-
-## Delete a peering connection
-<!--
-:::important
-
-- Before deleting an organization VPC, move all services out of this VPC.
-- Once an organization VPC is deleted, the cloud-provider side of the peering connections
-  becomes `inactive` or `deleted`.
-
-:::
-
-Delete an organization VPC using a tool of your choice:
-
-<Tabs groupId="group1">
-<TabItem value="console" label="Aiven Console" default>
-
-1. Log in to the [Aiven Console](https://console.aiven.io/), and click **Admin** in the
-   top navigation bar.
-1. Click <ConsoleLabel name="organizationvpcs"/> in the sidebar.
-1. On the **Organization VPCs** page, find a VPC to be deleted and click
-   <ConsoleLabel name="actions"/> > <ConsoleLabel name="delete"/>.
-1. In the **Confirmation** window, click **Delete VPC**.
-
-</TabItem>
-<TabItem value="cli" label="Aiven CLI">
-
-Run
-
-```bash
-avn organization vpc delete
-  --organization-id $org_id
-  --vpc-id 17528694-efb4-4f97-97e8-8bb4c7d31fee
-```
-
-</TabItem>
-<TabItem value="api" label="Aiven API">
-
-</TabItem>
-</Tabs>
--->
-## Related pages
-
-- [VPCs in Aiven](/docs/platform/concepts/vpcs)
-- [VPC peering in Aiven](/docs/platform/howto/list-vpc-peering)
-- [Manage organization VPCs](/docs/platform/howto/manage-organization-vpc)
+<VpcPeeringAws/>
diff --git a/docs/platform/howto/manage-org-vpc-peering-azure.md b/docs/platform/howto/manage-org-vpc-peering-azure.md
index 11572617..d68c89ab 100644
--- a/docs/platform/howto/manage-org-vpc-peering-azure.md
+++ b/docs/platform/howto/manage-org-vpc-peering-azure.md
@@ -1,6 +1,6 @@
 ---
 title: Manage organization VPC peering with Azure
-sidebar_label: Peer org VPCs with Azure
+sidebar_label: Peer organization VPCs with Azure
 ---
 
 import ConsoleLabel from "@site/src/components/ConsoleIcons";
diff --git a/docs/platform/howto/manage-org-vpc-peering-google.md b/docs/platform/howto/manage-org-vpc-peering-google.md
index 9fb16e6b..cc16ddaf 100644
--- a/docs/platform/howto/manage-org-vpc-peering-google.md
+++ b/docs/platform/howto/manage-org-vpc-peering-google.md
@@ -1,6 +1,6 @@
 ---
 title: Manage organization VPC peering with Google Cloud
-sidebar_label: Peer org VPCs with Google
+sidebar_label: Peer organization VPCs with Google
 ---
 
 import ConsoleLabel from "@site/src/components/ConsoleIcons";
diff --git a/docs/platform/howto/manage-org-vpc-peering-upcloud.md b/docs/platform/howto/manage-org-vpc-peering-upcloud.md
index 33e5d3ca..578beeee 100644
--- a/docs/platform/howto/manage-org-vpc-peering-upcloud.md
+++ b/docs/platform/howto/manage-org-vpc-peering-upcloud.md
@@ -1,6 +1,6 @@
 ---
 title: Manage organization VPC peering with UpCloud
-sidebar_label: Peer org VPCs with UpCloud
+sidebar_label: Peer organization VPCs with UpCloud
 ---
 
 import ConsoleLabel from "@site/src/components/ConsoleIcons";
diff --git a/docs/platform/howto/manage-pj-vpc-peering-aws.md b/docs/platform/howto/manage-pj-vpc-peering-aws.md
new file mode 100644
index 00000000..cbf40c65
--- /dev/null
+++ b/docs/platform/howto/manage-pj-vpc-peering-aws.md
@@ -0,0 +1,10 @@
+---
+title: Manage project VPC peering with AWS
+sidebar_label: Peer pj VPCs with AWS
+---
+
+import VpcPeeringAws from "@site/static/includes/manage-vpc-peering-aws.md"
+
+Set up a peering connection between your Aiven project VPC and an AWS VPC.
+
+<VpcPeeringAws/>
diff --git a/docs/platform/howto/org-vpc-peering-aws.md b/docs/platform/howto/org-vpc-peering-aws.md
new file mode 100644
index 00000000..977b6c22
--- /dev/null
+++ b/docs/platform/howto/org-vpc-peering-aws.md
@@ -0,0 +1,62 @@
+---
+title: Set up an organization VPC peering with AWS
+sidebar_label: Peer org VPCs with AWS
+---
+
+import ConsoleLabel from "@site/src/components/ConsoleIcons"
+
+Set up a peering connection between your Aiven project VPC and an AWS VPC.
+
+## Prerequisites
+
+- [Organization admin role](/docs/platform/concepts/permissions#organization-roles-and-permissions) to manage organization VPCs
+- Two VPCs to be peered: an
+  [organization VPC](/docs/platform/howto/manage-organization-vpc#create-an-organization-vpc)
+  in Aiven and a VPC in your AWS account
+- One of the following tools for VPC peering operations:
+  - [Aiven Console](https://console.aiven.io/)
+  - [Aiven CLI](/docs/tools/cli)
+  - [Aiven API](/docs/tools/api)
+
+## Create a peering connection
+
+### Collect data in the AWS Console
+
+1. Log in to the [AWS Management Console](https://console.aws.amazon.com) and go to your
+   profile information.
+1. Find and save your account ID.
+1. Go to the VPC service: **All services** > **Networking & Content Delivery** > **VPC**
+   \> **Your VPCs**.
+1. Find a VPC to peer and save its ID.
+1. Find and save a cloud region that the VPC is located in.
+
+### Create a peering in Aiven
+
+Create an organization VPC peering connection in the [Aiven Console](https://console.aiven.io/):
+
+1. Log in to the [Aiven Console](https://console.aiven.io/), and click **Admin** in the
+   top navigation bar.
+1. Click <ConsoleLabel name="organizationvpcs"/> in the sidebar.
+1. On the **Organization VPCs** page, select an organization VPC to peer.
+1. On the **Organization VPC details** page, click **Add peering connection**.
+1. In the **Add peering connection** window:
+   1. Enter the following:
+      - **AWS account ID**
+      - **AWS VPC region**
+      - **AWS VPC ID**
+   1. Click **Add peering connection**.
+
+This adds a connection pending acceptance in your AWS account.
+
+### Accept the peering request in the AWS Console
+
+1. Log in to the [AWS Management Console](https://console.aws.amazon.com), and go to the
+   VPC service (**All services** > **Networking & Content Delivery** > **VPC**).
+1. Click **Peering connections** in the sidebar.
+1. Find and select the peering request from Aiven, and  click **Actions** > **Accept request**.
+1. Create or update your [AWS route
+    tables](https://docs.aws.amazon.com/vpc/latest/peering/vpc-peering-routing) to match
+    your Aiven CIDR settings.
+
+When you accept the request in your AWS account, the peering connection gets
+activated in the [Aiven Console](https://console.aiven.io/).
diff --git a/docs/platform/howto/vpc-peering-aws.md b/docs/platform/howto/vpc-peering-aws.md
index 60607c42..ec25af6c 100644
--- a/docs/platform/howto/vpc-peering-aws.md
+++ b/docs/platform/howto/vpc-peering-aws.md
@@ -1,47 +1,60 @@
 ---
-title: Set up VPC peering on AWS
+title: Set up a project VPC peering with AWS
 sidebar_label: Peer project VPCs with AWS
 ---
 
 import ConsoleLabel from "@site/src/components/ConsoleIcons"
 
-Learn how to set up VPC peering on AWS.
+Set up a peering connection between your Aiven project VPC and an AWS VPC.
 
 ## Prerequisites
 
-Create a
-[VPC on the Aiven platform](/docs/platform/howto/manage-project-vpc).
-
-## Set up VPC peering
-
-1.  Open your AWS Console.
-
-1.  Go to **My Account** and make note of your account ID.
-
-1.  Go to the VPC service to find the VPC to connect and copy its ID.
-
-1.  In [Aiven Console](https://console.aiven.io/), select **VPCs** from
-    the sidebar on the **Services** page.
-
-1.  On the **Virtual private clouds** page, select the VPC connection
-    that you created.
-
-1.  On the **VPC Peering connections** page, enter your AWS account ID
-    and VPC ID, select the region for your AWS VPC, and select **Add
-    peering connection**.
-
-    :::note
-    A new connection with the **Pending Acceptance** status
-    is added in your AWS Console.
-    :::
-
-1.  In your AWS Console, ensure the account ID and VPC ID match
-    those listed in the [Aiven Console](https://console.aiven.io/) and,
-    if so, click <ConsoleLabel name="actions"/> > **Accept Request**.
-
-1.  Update [your AWS route
-    tables](https://docs.aws.amazon.com/vpc/latest/peering/vpc-peering-routing)
-    to match your Aiven CIDR settings.
-
-When you accept the request in AWS Console, the peering connection gets
+- [Project operator role](/docs/platform/concepts/permissions#project-roles-and-permissions) to manage project VPCs
+- Two VPCs to be peered: a
+  [project VPC](/docs/platform/howto/manage-project-vpc)
+  in Aiven and a VPC in your AWS account
+- One of the following tools for VPC peering operations:
+  - [Aiven Console](https://console.aiven.io/)
+  - [Aiven CLI](/docs/tools/cli)
+  - [Aiven API](/docs/tools/api)
+
+## Create a peering connection
+
+### Collect data in the AWS Console
+
+1. Log in to the [AWS Management Console](https://console.aws.amazon.com) and go to your
+   profile information.
+1. Find and save your account ID.
+1. Go to the VPC service: **All services** > **Networking & Content Delivery** > **VPC**
+   \> **Your VPCs**.
+1. Find a VPC to peer and save its ID.
+1. Find and save a cloud region that the VPC is located in.
+
+### Create a peering in Aiven
+
+Create a project VPC peering connection in [Aiven Console](https://console.aiven.io/):
+
+1. Log in to the [Aiven Console](https://console.aiven.io/), and go to your project page.
+1. Click <ConsoleLabel name="vpcs"/> in the sidebar.
+1. On the **Virtual private clouds** page, select a project VPC to peer.
+1. On the **VPC peering connections** page:
+   1. Enter the following:
+      - **AWS account ID**
+      - **AWS VPC region**
+      - **AWS VPC ID**
+   1. Click **Add peering connection**.
+
+This adds a connection pending acceptance in your AWS account.
+
+### Accept the peering request in the AWS Console
+
+1. Log in to the [AWS Management Console](https://console.aws.amazon.com), and go to the
+   VPC service (**All services** > **Networking & Content Delivery** > **VPC**).
+1. Click **Peering connections** in the sidebar.
+1. Find and select the peering request from Aiven, and  click **Actions** > **Accept request**.
+1. Create or update your [AWS route
+    tables](https://docs.aws.amazon.com/vpc/latest/peering/vpc-peering-routing) to match
+    your Aiven CIDR settings.
+
+When you accept the request in your AWS account, the peering connection gets
 activated in the [Aiven Console](https://console.aiven.io/).
diff --git a/sidebars.ts b/sidebars.ts
index f7dd1f5f..30e747d7 100644
--- a/sidebars.ts
+++ b/sidebars.ts
@@ -271,6 +271,7 @@ const sidebars: SidebarsConfig = {
                     'platform/howto/vnet-peering-azure',
                     'platform/howto/vpc-peering-upcloud',
                     'platform/howto/manage-org-vpc-peering-aws',
+                    'platform/howto/manage-pj-vpc-peering-aws',
                     'platform/howto/manage-org-vpc-peering-azure',
                     'platform/howto/manage-org-vpc-peering-google',
                     'platform/howto/manage-org-vpc-peering-upcloud',
diff --git a/static/includes/manage-vpc-peering-aws.md b/static/includes/manage-vpc-peering-aws.md
new file mode 100644
index 00000000..d9e70ba5
--- /dev/null
+++ b/static/includes/manage-vpc-peering-aws.md
@@ -0,0 +1,114 @@
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import ConsoleLabel from "@site/src/components/ConsoleIcons";
+
+## Prerequisites
+
+- [Organization admin role](/docs/platform/concepts/permissions#organization-roles-and-permissions) to manage organization VPCs
+- Two VPCs to be peered: an
+  [organization VPC](/docs/platform/howto/manage-organization-vpc#create-an-organization-vpc)
+  in Aiven and a VPC in your AWS account
+- One of the following tools for VPC peering operations:
+  - [Aiven Console](https://console.aiven.io/)
+  - [Aiven CLI](/docs/tools/cli)
+  - [Aiven API](/docs/tools/api)
+
+## Create a peering connection
+
+### Collect data in the AWS Console
+
+1. Log in to the [AWS Management Console](https://console.aws.amazon.com) and go to your
+   profile information.
+1. Find and save your account ID.
+1. Go to the VPC service: **All services** > **Networking & Content Delivery** > **VPC**
+   \> **Your VPCs**.
+1. Find a VPC to peer and save its ID.
+1. Find and save a cloud region that the VPC is located in.
+
+### Create a peering in Aiven
+
+Create an organization VPC peering connection using a tool of your choice:
+
+<Tabs groupId="group1">
+<TabItem value="console" label="Aiven Console" default>
+
+1. Log in to the [Aiven Console](https://console.aiven.io/), and click **Admin** in the
+   top navigation bar.
+1. Click <ConsoleLabel name="organizationvpcs"/> in the sidebar.
+1. On the **Organization VPCs** page, select an organization VPC to peer.
+1. On the **Organization VPC details** page, click **Add peering connection**.
+1. In the **Add peering connection** window:
+   1. Enter the following:
+      - **AWS account ID**
+      - **AWS VPC region**
+      - **AWS VPC ID**
+   1. Click **Add peering connection**.
+
+This adds a connection pending acceptance in your AWS account.
+
+### Accept the peering request in the AWS Console
+
+1. Log in to the [AWS Management Console](https://console.aws.amazon.com), and go to the
+   VPC service (**All services** > **Networking & Content Delivery** > **VPC**).
+1. Click **Peering connections** in the sidebar.
+1. Find and select the peering request from Aiven, and  click **Actions** > **Accept request**.
+1. Create or update your [AWS route
+    tables](https://docs.aws.amazon.com/vpc/latest/peering/vpc-peering-routing) to match
+    your Aiven CIDR settings.
+
+When you accept the request in your AWS account, the peering connection gets
+activated in the [Aiven Console](https://console.aiven.io/).
+
+</TabItem>
+<TabItem value="cli" label="Aiven CLI">
+
+</TabItem>
+<TabItem value="api" label="Aiven API">
+
+</TabItem>
+</Tabs>
+
+## Delete a peering connection
+<!--
+:::important
+
+- Before deleting an organization VPC, move all services out of this VPC.
+- Once an organization VPC is deleted, the cloud-provider side of the peering connections
+  becomes `inactive` or `deleted`.
+
+:::
+
+Delete an organization VPC using a tool of your choice:
+
+<Tabs groupId="group1">
+<TabItem value="console" label="Aiven Console" default>
+
+1. Log in to the [Aiven Console](https://console.aiven.io/), and click **Admin** in the
+   top navigation bar.
+1. Click <ConsoleLabel name="organizationvpcs"/> in the sidebar.
+1. On the **Organization VPCs** page, find a VPC to be deleted and click
+   <ConsoleLabel name="actions"/> > <ConsoleLabel name="delete"/>.
+1. In the **Confirmation** window, click **Delete VPC**.
+
+</TabItem>
+<TabItem value="cli" label="Aiven CLI">
+
+Run
+
+```bash
+avn organization vpc delete
+  --organization-id $org_id
+  --vpc-id 17528694-efb4-4f97-97e8-8bb4c7d31fee
+```
+
+</TabItem>
+<TabItem value="api" label="Aiven API">
+
+</TabItem>
+</Tabs>
+-->
+## Related pages
+
+- [VPCs in Aiven](/docs/platform/concepts/vpcs)
+- [VPC peering in Aiven](/docs/platform/howto/list-vpc-peering)
+- [Manage organization VPCs](/docs/platform/howto/manage-organization-vpc)