diff --git a/public/_redirects b/public/_redirects
index 2d883423dfcba57..afe3281e58dc066 100644
--- a/public/_redirects
+++ b/public/_redirects
@@ -374,6 +374,8 @@
# email-security
/email-security/setup/api-deployment/ /email-security/setup/post-delivery-deployment/api/ 301
/email-security/setup/api-deployment/office365-api/ /email-security/setup/post-delivery-deployment/api/office365-api/ 301
+/email-security/email-configuration/retract-settings/gmail-retraction/ /email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction/ 301
+
# firewall
/firewall/api/cf-lists/ /waf/tools/lists/lists-api/ 301
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup.mdx
deleted file mode 100644
index 535a6de48a2f728..000000000000000
--- a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup.mdx
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Gmail BCC setup
-pcx_content_type: integration-guide
-updated: 2022-10-11
-sidebar:
- order: 1
-head:
- - tag: title
- content: Setup phishing risk assessment for Gmail with Email Security (formerly
- Area 1)
-
----
-
-import { Render } from "~/components"
-
-:::caution[Area 1 has been renamed]
-
-
-
-
-
-:::
-
-For customers using Gmail, setting up Email Security via BCC is quick and easy. All you need to do is create a content compliance filter to send emails to Email Security through BCC. The following email flow shows how this works:
-
-
-
-To setup Email Security (formerly Area 1) phishing risk assessment for Gmail:
-
-
-
-## Geographic locations
-
-
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/add-domain.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/add-domain.mdx
new file mode 100644
index 000000000000000..98cafdb46489eab
--- /dev/null
+++ b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/add-domain.mdx
@@ -0,0 +1,23 @@
+---
+title: Find BCC address and add domain
+pcx_content_type: how-to
+sidebar:
+ order: 2
+---
+
+import { Render } from "~/components"
+
+:::caution[Area 1 has been renamed]
+
+:::
+
+To set up Email Security (formerly Area 1) for Gmail:
+
+1. Log in to the [Email Security (formerly Area 1) dashboard](https://horizon.area1security.com/).
+2. Select the question mark, where you will be able to find your BCC address.
+3. Once you found your address, select **Settings** (the gear icon), then select **New Domain**.
+4. Fill in the information needed to add your domain, then select **Publish Domain**.
+
+## Next steps
+
+Now that you have found your BCC address and added your domain, continue with [Add BCC rules](/email-security/deployment/api/setup/gsuite-bcc-setup/bcc-rules-to-area1/) to add BCC rules to Email Security.
\ No newline at end of file
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction.mdx
new file mode 100644
index 000000000000000..916938572b7d7d0
--- /dev/null
+++ b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction.mdx
@@ -0,0 +1,26 @@
+---
+title: Add retraction
+pcx_content_type: how-to
+sidebar:
+ order: 5
+---
+
+import { Render } from "~/components"
+
+1. On the [Email Security (formerly Area 1) dashboard](https://horizon.area1security.com/), select **Domains** under **DOMAINS & ROUTING**, then select **NEW DOMAIN**. Fill in the information to add a new domain:
+ - On **FORWARDING TO**: Enter `Google.com`.
+ - Adjust **Hops** to 2.
+ - On **Outbound TLS**: Ensure you select **Forward all messages over TLS**.
+2. Select **Publish Domain**.
+3. Select **RETRACT SETTINGS** > **Authorize Gmail**.
+4. Upload the JSON file [previously generated](/email-security/deployment/api/setup/gsuite-bcc-setup/create-service-account/).
+5. Under **DOMAINS**, select the domain you added previously, then select **SAVE**.
+
+## Post delivery retractions for new threats
+
+Email Security (formerly Area 1) is continuously gathering new information about phishing campaigns. Users might have email messages in their inboxes that were scanned by Email Security but not retracted initially because, at the time of scan, these email messages had not been identified as a threat. To mitigate risk, Email Security offers you tools to re-evaluate email messages at a fixed time interval based on knowledge Cloudflare may have acquired since initial delivery. Any email messages that fit this new threat knowledge will be retracted.
+
+You can enable two options:
+
+- **Post Delivery Response**: Email Security will continue to re-evaluate emails already delivered to your users' inboxes at a fixed time interval in search for phishing sites or campaigns not previously known to Cloudflare. If any email messages fitting these new criteria are found, Email Security retracts them.
+- **Phish Submission Response**: Email Security will retract emails already delivered that are reported by your users as phishing, and are found to be malicious by Email Security. Retraction will occur according to your configuration.
\ No newline at end of file
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/bcc-rules-to-area1.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/bcc-rules-to-area1.mdx
new file mode 100644
index 000000000000000..a5f8637f7e3ac00
--- /dev/null
+++ b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/bcc-rules-to-area1.mdx
@@ -0,0 +1,31 @@
+---
+title: Add BCC rules
+pcx_content_type: how-to
+sidebar:
+ order: 3
+---
+
+import { Render } from "~/components"
+
+1. In the [Google Admin console](https://admin.google.com/), go to **Menu** > **Apps** > **Google Workspace** > **Gmail** > **Compliance**.
+2. Go to **Content Compliance** > Select **Edit**.
+3. Add a **Content Compliance** filter, and name it `Email Security (Area 1) - BCC`.
+4. In **Email messages to affect**, select **Inbound**.
+5. Select the recipients you want to send emails to Email Security (formerly Area 1) via BCC:
+ 1. Select **Add** to configure the expression.
+ 2. Select **Advanced content match**.
+ 3. In **Location**, select **Headers + Body**.
+ 4. In **Match type**, select **Matches regex**.
+ 5. In **Regexp** input `.*`. You can customize the regex as needed and test within the admin page or on sites like [Regexr](https://regexr.com/).
+ 6. Select **SAVE**.
+6. In **If the above expressions match, do the following**, select **Modify message**, select **Add more recipients** > Select **ADD** > Choose **Advanced**:
+ 1. Under **Envelope recipient**, select **Change envelope recipient** > **Replace recipient** > Enter the email of the recipient.
+ 2. Under **Spam and delivery options**, select **Suppress bounces from this recipient**.
+ 3. Under **Headers**, select **Add X-Gm-Spam and X-Gm-Phishy headers**.
+ 4. Select **SAVE**.
+7. In **Account types to affect**, select **Users** and **Groups**.
+8. Select **SAVE**.
+
+## Next steps
+
+Now that you have added BCC rules on the Area 1 portal, you need to [create a project on Google Cloud Console](/email-security/deployment/api/setup/gsuite-bcc-setup/create-project-gcp/).
\ No newline at end of file
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/create-project-gcp.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/create-project-gcp.mdx
new file mode 100644
index 000000000000000..c048342c14ef3c7
--- /dev/null
+++ b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/create-project-gcp.mdx
@@ -0,0 +1,19 @@
+---
+title: Create a project on Google Cloud Console
+pcx_content_type: how-to
+sidebar:
+ order: 4
+---
+
+import { Render } from "~/components"
+
+1. Log in to the [Google Cloud Console](https://console.cloud.google.com/welcome/new). From the dashboard, select **CREATE OR SELECT PROJECT**.
+2. Provide the details for the new project, and select **CREATE** to start your new project.
+3. Once the new project has been created, the Google Cloud Platform console will automatically redirect you to the Project console. If not, you can use the Project selector to change to the project you created.
+4. In **Getting Started**, select **Explore and enable APIs** > Select **ENABLE APIs & SERVICES**.
+5. On search bar, search for `Admin SDK API`. Select **Admin SDK API**, then select **ENABLE**.
+6. Go back to the sidebar, select **Library**, and search for Gmail API. Select **Gmail API**, then select **ENABLE**.
+
+## Next steps
+
+Now that you have created a project on Google Cloud Console, you need to [create a service account](/email-security/deployment/api/setup/gsuite-bcc-setup/create-service-account/) on Google Cloud Console.
\ No newline at end of file
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/create-service-account.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/create-service-account.mdx
new file mode 100644
index 000000000000000..9cad42abef70c48
--- /dev/null
+++ b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/create-service-account.mdx
@@ -0,0 +1,35 @@
+---
+title: Create service account
+pcx_content_type: how-to
+sidebar:
+ order: 4
+---
+
+import { Render } from "~/components"
+
+1. On the [Google Cloud Console](https://console.cloud.google.com/welcome/new), select **Credentials**.
+2. Select **CREATE CREDENTIALS** > **Service account**.
+3. Fill in the details to create a service account:
+ - **Service account name**: Enter `Message Retraction Service Account`.
+ - **Service account ID**: Enter `message-retraction-service-acc`.
+ - **Service account description**: Enter `Email Security Message Retraction`.
+ - Select **CREATE AND CONTINUE**.
+4. In **Grant this service account access to project**, select **Select a role** > Choose **Owner**. Select **CONTINUE**, then **DONE**.
+5. Go back to **Credentials**, and select your service account under **Service Accounts**. In **Details**, take note of the **Unique ID**.
+6. Select **Advanced settings** > **VIEW GOOGLE WORKSPACE ADMIN CONSOLE**, then enter your password.
+7. On the sidebar, select **Security** > **Access and data control** > **API controls** > Select **MANAGE DOMAIN WIDE DELEGATION**.
+8. Select **Add new** > Add a new client ID:
+ - **Client ID**: Enter the **Unique ID** you took note of.
+ - **OAuth scopes**: Enter the following URLs:
+
+ ```txt
+ https://www.googleapis.com/auth/admin.directory.user.readonly, https://www.googleapis.com/auth/admin.directory.group.readonly, https://www.googleapis.com/auth/admin.directory.user.alias.readonly, https://www.googleapis.com/auth/gmail.labels, https://mail.google.com/
+ ```
+ - Select **AUTHORIZE**.
+
+9. Go back to the sidebar > **Service Accounts**.
+10. Select the three dots > **Manage keys** > **ADD KEY** > **Create new key** > Select **JSON** > Select **CREATE**. This downloads a `.json` file which you will use at a later stage.
+
+## Next steps
+
+Now that you have created a service account, proceed to [adding retractions](/email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction/) to your email.
\ No newline at end of file
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/geographic locations.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/geographic locations.mdx
new file mode 100644
index 000000000000000..fd9f9fc26f80719
--- /dev/null
+++ b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/geographic locations.mdx
@@ -0,0 +1,10 @@
+---
+title: Geographic locations
+pcx_content_type: reference
+sidebar:
+ order: 6
+---
+
+import { Render } from "~/components"
+
+
\ No newline at end of file
diff --git a/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/index.mdx b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/index.mdx
new file mode 100644
index 000000000000000..316bfe554af4b16
--- /dev/null
+++ b/src/content/docs/email-security/deployment/api/setup/gsuite-bcc-setup/index.mdx
@@ -0,0 +1,31 @@
+---
+title: Gmail BCC setup
+pcx_content_type: integration-guide
+sidebar:
+ order: 1
+head:
+ - tag: title
+ content: Setup Gmail with Email Security (formerly
+ Area 1)
+
+---
+
+import { Render, Details } from "~/components"
+
+:::caution[Area 1 has been renamed]
+
+
+
+:::
+
+For customers using Gmail, setting up Email Security via BCC is quick and easy. All you need to do is create a content compliance filter to send emails to Email Security through BCC. The following email flow shows how this works:
+
+
+
+To set up Gmail with Email Security:
+
+1. [Find your BCC address and add a domain](/email-security/deployment/api/setup/gsuite-bcc-setup/add-domain/).
+2. [Add BCC rules](/email-security/deployment/api/setup/gsuite-bcc-setup/bcc-rules-to-area1/).
+3. [Create a project on Google Cloud Console](/email-security/deployment/api/setup/gsuite-bcc-setup/create-project-gcp/).
+4. [Create a service account](/email-security/deployment/api/setup/gsuite-bcc-setup/create-service-account/).
+5. [Add retraction](/email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction/).
\ No newline at end of file
diff --git a/src/content/docs/email-security/email-configuration/retract-settings/gmail-retraction.mdx b/src/content/docs/email-security/email-configuration/retract-settings/gmail-retraction.mdx
deleted file mode 100644
index 22f208203c79875..000000000000000
--- a/src/content/docs/email-security/email-configuration/retract-settings/gmail-retraction.mdx
+++ /dev/null
@@ -1,207 +0,0 @@
----
-title: Gmail retraction
-pcx_content_type: how-to
-sidebar:
- order: 1
-head:
- - tag: title
- content: Retraction guide for Gmail
-
----
-
-import { Render } from "~/components"
-
-
-
-In this tutorial you will learn how to set up email retraction for Gmail.
-
-## 1. Configure project and service account in Google Cloud Platform
-
-For Email Security to be able to retract messages from Gmail inboxes, you first need to create a service account in a Google Cloud Platform (GCP) project.
-
-1. Access the [Google Cloud Console](https://console.cloud.google.com). From the Dashboard, select **CREATE PROJECT**.
-
- 
-
-2. Provide the details for the new project, and select **CREATE** to start your new project.
-
- 
-
-3. Once the new project has been created, the GCP console will automatically redirect you to the Project console. If not, you can use the **Project selector** to change to the project you created.
-
- 
-
-4. In the **Getting Started** card, select **Explore and enable APIs** to access the APIs and services configuration console.
-
- 
-
-5. Select **ENABLE APIS AND SERVICES** to open the API Library.
-
- 
-
-6. You will need to enable the Admin SDK API and the Gmail API. On the API Library, locate the **Google Workspace** section. Then, select **View All** to access all the available APIs for Google Workspace.
-
- 
-
-7. Select **Admin SDK API**.
-
- 
-
-8. Select **Enable** to activate the Admin SDK API.
-
- 
-
-9. Return to the Google Workspace API library, and select the **Gmail API**.
-
- 
-
-10. Select **ENABLE** to activate the Gmail API.
-
- 
-
-11. You will now create a service account to use the API. From the **Gmail API console**, select **Credentials**.
-
- 
-
-12. Select **CREATE CREDENTIALS** > **Service account**.
-
- 
-
-13. In **Service account details** provide the following information:
-
- * **Service account name**: `Message Retraction Service Account`
- * **Service account ID**: This value is automatically generated.
- * **Service account description**: A description for this service. For example, `Email Security Message Retraction`
-
- Select **CREATE AND CONTINUE** when you are done.
-
- 
-
-14. In **Grant this service account access to project**, select the **Select a role** drop-down menu. Then, select **Project** on the left column, and **Owner** on the right column.
-
- 
-
-15. Once the role is assigned, select **DONE** to complete the setup.
-
- 
-
-16. Once the role assignment has been saved, you will return to the API credential configuration console. In **Service Accounts**, select the newly-created service account to configure the domain-wide delegation.
-
- 
-
-17. In **Details**, take note of the **Unique ID**. Then, select **SHOW ADVANCED SETTINGS**.
-
- 
-
-:::note[Note]
-Write down the **Unique ID** value. This information will be required in the next step, for the configuration of domain-wide delegation in the Google Workspace configuration.
-:::
-
-18. Select **VIEW GOOGLE WORKSPACE ADMIN CONSOLE** to configure the domain-wide delegation. This will open a new window to the Google admin console.
-
- 
-
-19. Go to **Security** > **Access and data control** > **API controls**.
-
- 
-
-20. Find the **Domain wide delegation** section, and select **MANAGE DOMAIN WIDE DELEGATION**.
-
- 
-
-21. Select **Add new** to add a new client ID.
-
- 
-
-22. In **Add a new client ID**, enter the following information:
-
- * **Client ID**: Enter your client ID. This is the Unique ID value you saved in step 17.
- * **OAuth scopes**: Enter the following information (the input field accepts comma separated values):
-
- ```txt
- https://www.googleapis.com/auth/admin.directory.user.readonly, https://www.googleapis.com/auth/admin.directory.group.readonly, https://www.googleapis.com/auth/admin.directory.user.alias.readonly, https://www.googleapis.com/auth/gmail.labels, https://mail.google.com/
- ```
-
- Select **AUTHORIZE** when you are finished.
-
- 
-
-23. Return to the Google Cloud Platform (GCP) console, and select **IAM & Admin** > **Service Accounts** to return to the service account screen.
-
- 
-
-24. You need to create an API key in the Service account configuration panel. Select the three dots button to open the menu. Then, select **Manage keys**:
-
- 
-
-25. In the Keys configuration panel, select **ADD KEY** > **Create new key**.
-
- 
-
-26. In **Key type** select **JSON** as the format to create the private key. Then, select **CREATE**.
-
- 
-
-:::caution[Important]
-Save this key in a secure location as it allows access to your cloud resources. You will need to share it with Email Security as part of the configuration process in the next step.
-:::
-
-## 2. Share the service account JSON key with Email Security
-
-You have to upload the private key generated in the previous step to Email Security. This is needed to execute retractions on your Gmail inboxes.
-
-1. Log in to the [Email Security dashboard](https://horizon.area1security.com/), and select **Settings** (the gear icon).
-
-2. Go to **Email Configuration** > **RETRACT SETTINGS** > **Authorize Gmail**.
-
- 
-
-3. Select **New Authorization** and configure the following settings:
-
- * Select **AUTHORIZATION DATA (JWT)**, and find and upload your JSON private key.
- * Under **Domains**, specify which domain this private key belongs to.
- * Select **Save** to save the configuration.
-
- 
-
-## 3. Configure auto-retraction actions in Email Security
-
-:::caution[Important]
-If you choose the hard delete retraction for Gmail, email messages will be permanently deleted. These messages cannot be recovered, even by admins.
-:::
-
-
-
-## 4. Adjust the hop count in Email Security
-
-Since Email Security is not configured as the MX record for your domains, you will need to adjust Area 1’s position (hop count) relative to Area 1’s position in the email processing order.
-
-1. Log in to the [Email Security dashboard](https://horizon.area1security.com/), and select **Settings** (the gear icon).
-
-2. Go to **Email Configuration** > **DOMAINS & ROUTING**.
-
-3. Select the three-dots menu on the domain you want to verify the position, and then select **Edit**.
-
- 
-
-4. For standalone Gmail only deployments, the value should be set to `2`. If it is not, adjust the **Hops** count to `2`, and select **Update Domain**.
-
- 
-
-:::note
-If you have an existing secure email gateway (SEG) deployed as the MX record, you will need to adjust the hop count accordingly.
-:::
-
-## 5. Configure BCC rule in Google Workspaces
-
-You must send copies of inbound email messages to Email Security for inspection, so that Email Security can automatically retract messages. Messages can be sent to Email Security using a BCC compliance rule. Refer to the steps below to learn how to set this up. Automatic retraction is not available when Email Security is deployed as MX.
-
-
-
-### Geographic locations
-
-
-
-## 6. Manual message retraction
-
-
diff --git a/src/content/docs/email-security/email-configuration/retract-settings/index.mdx b/src/content/docs/email-security/email-configuration/retract-settings/index.mdx
index ac03a1e514d9b60..1d089cdbaa8db78 100644
--- a/src/content/docs/email-security/email-configuration/retract-settings/index.mdx
+++ b/src/content/docs/email-security/email-configuration/retract-settings/index.mdx
@@ -16,7 +16,7 @@ However — so long as you also have [journaling](/email-security/deployment/api
Once you set up retraction, you can retract messages manually or set up automatic retractions to move messages matching certain dispositions to specific folders within a user’s mailbox. You can also enable Post Delivery Response and Phish Submission Response to re-evaluate messages previously delivered against new information gathered by Email Security. Scanned emails that were previously delivered and now match this new phishing information will be retracted.
-Refer to [Gmail](/email-security/email-configuration/retract-settings/gmail-retraction/) and [Office 365](/email-security/email-configuration/retract-settings/office365-retraction/) guides for detailed information regarding these options.
+Refer to [Gmail](/email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction/) and [Office 365](/email-security/email-configuration/retract-settings/office365-retraction/) guides for detailed information regarding these options.
## Retraction metrics
diff --git a/src/content/docs/email-security/reporting/audit-logs.mdx b/src/content/docs/email-security/reporting/audit-logs.mdx
index 3caa0c70646e269..64d1d1c205e7479 100644
--- a/src/content/docs/email-security/reporting/audit-logs.mdx
+++ b/src/content/docs/email-security/reporting/audit-logs.mdx
@@ -22,7 +22,7 @@ You can use Email Security logs to review actions performed on your account:
You can use one of the Preview logs to preview how Email Security handles post delivery retractions. With Audit logs Preview, Email Security shows you the emails that would have been retracted with Post Delivery Response (PDR) or Phish Submissions Response (PSR) enabled.
-Refer to **Post delivery retractions for new threats** for [Gmail](/email-security/email-configuration/retract-settings/gmail-retraction/#post-delivery-retractions-for-new-threats) or [Office 365](/email-security/email-configuration/retract-settings/office365-retraction/#post-delivery-retractions-for-new-threats) to learn more about this feature.
+Refer to **Post delivery retractions for new threats** for [Gmail](/email-security/deployment/api/setup/gsuite-bcc-setup/add-retraction/#post-delivery-retractions-for-new-threats) or [Office 365](/email-security/email-configuration/retract-settings/office365-retraction/#post-delivery-retractions-for-new-threats) to learn more about this feature.
To review preview logs: