diff --git a/content/docs/EagleEye/prerequisites.mdx b/content/docs/EagleEye/prerequisites.mdx
index 96e627e46..15a2e25cd 100644
--- a/content/docs/EagleEye/prerequisites.mdx
+++ b/content/docs/EagleEye/prerequisites.mdx
@@ -17,185 +17,3 @@ Before starting the installation, ensure you have:
* **Azure OpenAI** quota available in your subscription
* \***Custom domain** and DNS zone in Azure (optional)
-
-
-### Register Azure resource providers
-
-
-Before deploying EagleEye, make sure the following Azure resource providers are registered in your subscription:
-
- - Microsoft.Storage
- - Microsoft.ManagedIdentity
- - Microsoft.App
- - Microsoft.CognitiveServices
- - Microsoft.KeyVault
- - Microsoft.ContainerRegistry
- - Microsoft.Network
- - Microsoft.OperationalInsights
- - Microsoft.Insights
- - Microsoft.Sql
- - Microsoft.Authorization
- - Microsoft.Web
- - Microsoft.ContainerInstance
-
-To check and register, follow the official Microsoft guide:
-[Register resource providers in Azure Portal](https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/resource-providers-and-types#azure-portal)
-
-
-## Get Your Azure Tenant ID
-
-You will need your Azure Tenant ID for configuration:
-
-1. Sign in to the [Azure Portal](https://portal.azure.com)
-2. In the search bar, type "Microsoft Entra ID"
- 
-3. Go to **Manage Tenants** and copy the **Tenant ID (Organization ID)**
- 
- 
-
-> **Note:** If you have multiple tenants, ensure you select the correct one for EagleEye deployment.
-
-## Get Your Azure Group Name
-
-You will need an Azure group for EagleEye to perform email analysis. This can be either an existing Azure group or a new one you create.
-
-To create a new group or find an existing one:
-
-1. Sign in to the [Azure Portal](https://portal.azure.com)
-2. In the search bar, type "Groups"
- 
-3. Go to **Groups** → **All groups**
-4. Either select an existing group or click **New group** to create one
-5. If creating a new group:
- - Follow this [guide](https://learn.microsoft.com/en-us/entra/fundamentals/how-to-manage-groups) to create and configure a new group
- - Select **Security** as the Group type if you want to add other groups as members (nesting), otherwise select **Microsoft 365**
-6. Copy the **Group name** (you will need this for configuration later)
-
-## App Registration Guide
-
-You need **3 Azure App Registrations** for EagleEye:
-
-1. **Engine App** - `SSW.EagleEye.Engine`
-2. **API App** - `SSW.EagleEye.Api`
-3. **Portal App** - `SSW.EagleEye.Portal`
-
-> **Tip:** Create one app and its client secret at a time to avoid confusion. \
-> \
-> By the end of this section, you should have 3 client secrets and 1 API scope URL ready for your EagleEye deployment.
-
-### Step 1: Create Each App Registration
-
-For each of the 3 apps:
-
-1. Go to **Azure Portal** → **App registrations** → **New registration**
- 
-2. Enter the app name (e.g., `SSW.EagleEye.Engine`)
-3. Set **Supported account types** to: **Accounts in this organizational directory only**
-4. Click **Register**
- 
-
-### Step 2: Create a Client Secret
-
-Repeat these steps for each app:
-
-1. Go to **Certificates & secrets**
-2. Click **New client secret**
-3. Add a description (e.g., `Engine Secret`, `API Secret`, `Portal Secret`)
-4. Select an expiry period → **Add**
- 
-5. **Copy the secret value immediately** (you will need this later; it will never be shown again)
- 
-
-> **Warning:** After deployment, remove the secret value from any temporary notes (clipboard, notepad, etc.). \
->
-> Do not delete the secret from Azure
-
-
-> Remember to repeat **Steps 1 & 2** for all 3 app registrations
-
-
-## App-Specific Configuration
-
-These are the only extra settings required for each app registration.
-
-### Engine App - Configure API Permissions
-
-**App:** `SSW.EagleEye.Engine`
-
-1. Go to **App registrations** → **All applications** → search for `SSW.EagleEye.Engine`
- 
-2. Go to **Manage** → **API permissions** → **Add a permission**
-3. Select **Microsoft Graph** → **Application permissions** (Important: select Application permissions - not Delegated).
-4. Add:
- * `GroupMember.Read.All`
- * `Mail.Read`
- * `User.Read.All`
- * `Domain.Read.All`
-
-5. Click **Add permissions**
-6. Click **Grant admin consent**
- 
-
-### API App - Expose a Scope
-
-**App:** `SSW.EagleEye.Api`
-
-This exposes the API so the Portal can call it.
-
-1. Go to **App registrations** → **All applications** → search for `SSW.EagleEye.Api`
-2. Go to **Expose an API** → **Add a scope**
-3. Accept the default Application ID URI (or customise) → **Save and continue**
- 
-4. Configure the scope:
- * **Scope name:** `access_as_user`
- * **Who Can Consent:** *Admins and users*
- * **Admin consent display name:** `Access SSW EagleEye as user`
- * **Admin consent description:** `Allow the application to access SSW EagleEye on behalf of the signed-in user`
-5. Click **Add scope**
- 
-6. **Copy the full scope URL** (e.g., `api://xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/access_as_user`)
-
-You will need this during deployment.
-
-### Portal App - Configure API Permission
-
-**App:** `SSW.EagleEye.Portal`
-
-This allows the Portal web app to call the API.
-
-1. Go to **App registrations** → **All applications** → search for `SSW.EagleEye.Portal`
-2. Go to **API permissions** → **Add a permission**
-3. Select **APIs my organization uses** → choose **SSW\.EagleEye.Api**
- 
-4. Select **Delegated permissions** → `access_as_user`
-5. Click **Add permissions**
- 
-6. Click **Grant admin consent**
- 
-
-## Control Who Can Sign In to Your EagleEye Portal
-
-You can choose exactly which users or groups are allowed to access your EagleEye Portal.
-By default, Azure lets *any* user in your tenant sign in - so it’s important to lock this down.
-
-### Secure the Portal App
-1. In the Azure Portal, search for **Enterprise applications**
-2. Select your **SSW.EagleEye.Portal** enterprise app
-3. In the left menu, go to **Manage → Properties**
-4. Set **Assignment required** to **Yes**
- - This ensures **only the users or groups you assign** can sign in.
- - If this is set to **No**, *any* user in your tenant will be able to access your EagleEye portal.
-5. Click **Save**
-
-
-### Assign Users/Groups to the Portal App
-1. In the same **SSW.EagleEye.Portal** enterprise app, go to **Manage → Users and groups**
-2. Click **Add user/group**
-3. Select the users or groups you want to give access to.
-4. Click **Assign**
-
-
-
-## References
-
-* [Azure Marketplace overview](https://learn.microsoft.com/en-us/marketplace/azure-marketplace-overview)
diff --git a/content/docs/EagleEye/step-1-azure-setup.mdx b/content/docs/EagleEye/step-1-azure-setup.mdx
new file mode 100644
index 000000000..258b604f8
--- /dev/null
+++ b/content/docs/EagleEye/step-1-azure-setup.mdx
@@ -0,0 +1,64 @@
+---
+seo:
+ title: SSW EagleEye - Step 1 Azure Setup
+ description: >-
+ Configure your Azure subscription, register required resource providers,
+ and gather tenant and group details needed before installing SSW EagleEye
+ from the Azure Marketplace.
+title: Step 1 - Azure Setup
+date: '2025-12-29T13:00:00.000Z'
+---
+
+### Step 1.1 - Register Azure resource providers
+
+
+
+> Tip: Jump to 0:50 for Azure Setup
+
+Before deploying EagleEye, make sure the following Azure resource providers are registered in your subscription:
+
+* Microsoft.Storage
+* Microsoft.ManagedIdentity
+* Microsoft.App
+* Microsoft.CognitiveServices
+* Microsoft.KeyVault
+* Microsoft.ContainerRegistry
+* Microsoft.Network
+* Microsoft.OperationalInsights
+* Microsoft.Insights
+* Microsoft.Sql
+* Microsoft.Authorization
+* Microsoft.Web
+* Microsoft.ContainerInstance
+
+To check and register, follow the official Microsoft guide:
+[Register resource providers in Azure Portal](https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/resource-providers-and-types#azure-portal)
+
+### Step 1.2 - Get Your Azure Tenant ID
+
+You will need your Azure Tenant ID for configuration:
+
+1. Sign in to the [Azure Portal](https://portal.azure.com)
+2. In the search bar, type "Microsoft Entra ID"
+ 
+3. Go to **Manage Tenants** and copy the **Tenant ID (Organization ID)**
+ 
+ 
+
+> **Note:** If you have multiple tenants, ensure you select the correct one for EagleEye deployment.
+
+### Step 1.3 - Get Your Azure Group Name
+
+You will need an Azure group for EagleEye to perform email analysis. This can be either an existing Azure group or a new one you create.
+
+To create a new group or find an existing one:
+
+1. Sign in to the [Azure Portal](https://portal.azure.com)
+2. In the search bar, type "Groups"
+ 
+3. Go to **Groups** → **All groups**
+4. Either select an existing group or click **New group** to create one
+5. If creating a new group:
+ * Follow this [guide](https://learn.microsoft.com/en-us/entra/fundamentals/how-to-manage-groups) to create and configure a new group
+ * Select **Security** as the Group type if you want to add other groups as members (nesting), otherwise select **Microsoft 365**
+6. Copy the **Group name** (you will need this for configuration later)
diff --git a/content/docs/EagleEye/step-2-app-registrations.mdx b/content/docs/EagleEye/step-2-app-registrations.mdx
new file mode 100644
index 000000000..48b6826b4
--- /dev/null
+++ b/content/docs/EagleEye/step-2-app-registrations.mdx
@@ -0,0 +1,135 @@
+---
+seo:
+ title: SSW EagleEye - Step 2 App Registrations
+ description: >-
+ Create and configure the three Azure App Registrations required for SSW
+ EagleEye, including client secrets, Microsoft Graph permissions, API
+ scopes, and secure portal access control.
+title: Step 2 - App Registrations
+date: '2025-12-29T13:00:00.000Z'
+---
+
+
+
+> Tip: Jump to 5:00 for App Registrations
+
+You need **3 Azure App Registrations** for EagleEye:
+
+1. **Engine App** - `SSW.EagleEye.Engine`
+2. **API App** - `SSW.EagleEye.Api`
+3. **Portal App** - `SSW.EagleEye.Portal`
+
+> **Tip:** Create one app and its client secret at a time to avoid confusion. \
+> \
+> By the end of this section, you should have 3 client secrets and 1 API scope URL ready for your EagleEye deployment.
+
+### Step 2.1 - Create Each App Registration
+
+For each of the 3 apps:
+
+1. Go to **Azure Portal** → **App registrations** → **New registration**
+ 
+2. Enter the app name (e.g., `SSW.EagleEye.Engine`)
+3. Set **Supported account types** to: **Accounts in this organizational directory only**
+4. Click **Register**
+ 
+
+### Step 2.2 - Create a Client Secret
+
+Repeat these steps for each app:
+
+1. Go to **Certificates & secrets**
+2. Click **New client secret**
+3. Add a description (e.g., `Engine Secret`, `API Secret`, `Portal Secret`)
+4. Select an expiry period → **Add**
+ 
+5. **Copy the secret value immediately** (you will need this later; it will never be shown again)
+ 
+
+> **Warning:** After deployment, remove the secret value from any temporary notes (clipboard, notepad, etc.).
+> \
+> Do not delete the secret from Azure
+
+> Remember to repeat **Steps 2.1 & 2.2** for all 3 app registrations
+
+## Step 2.3 - App-Specific Configuration
+
+These are the only extra settings required for each app registration.
+
+### Step 2.3.1 - Engine App - Configure API Permissions
+
+**App:** `SSW.EagleEye.Engine`
+
+1. Go to **App registrations** → **All applications** → search for `SSW.EagleEye.Engine`
+ 
+2. Go to **Manage** → **API permissions** → **Add a permission**
+3. Select **Microsoft Graph** → **Application permissions** (Important: select Application permissions - not Delegated).
+4. Add:
+ * `GroupMember.Read.All`
+ * `Mail.Read`
+ * `User.Read.All`
+ * `Domain.Read.All`
+5. Click **Add permissions**
+6. Click **Grant admin consent**
+ 
+
+### Step 2.3.2 - API App - Expose a Scope
+
+**App:** `SSW.EagleEye.Api`
+
+This exposes the API so the Portal can call it.
+
+1. Go to **App registrations** → **All applications** → search for `SSW.EagleEye.Api`
+2. Go to **Expose an API** → **Add a scope**
+3. Accept the default Application ID URI (or customise) → **Save and continue**
+ 
+4. Configure the scope:
+ * **Scope name:** `access_as_user`
+ * **Who Can Consent:** *Admins and users*
+ * **Admin consent display name:** `Access SSW EagleEye as user`
+ * **Admin consent description:** `Allow the application to access SSW EagleEye on behalf of the signed-in user`
+5. Click **Add scope**
+ 
+6. **Copy the full scope URL** (e.g., `api://xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/access_as_user`)
+
+You will need this during deployment.
+
+### Step 2.3.3 - Portal App - Configure API Permission
+
+**App:** `SSW.EagleEye.Portal`
+
+This allows the Portal web app to call the API.
+
+1. Go to **App registrations** → **All applications** → search for `SSW.EagleEye.Portal`
+2. Go to **API permissions** → **Add a permission**
+3. Select **APIs my organization uses** → choose **SSW.EagleEye.Api**
+ 
+4. Select **Delegated permissions** → `access_as_user`
+5. Click **Add permissions**
+ 
+6. Click **Grant admin consent**
+ 
+
+## Control Who Can Sign In to Your EagleEye Portal
+
+You can choose exactly which users or groups are allowed to access your EagleEye Portal.\
+By default, Azure lets *any* user in your tenant sign in - so it’s important to lock this down.
+
+### Step 2.4 - Secure the Portal App
+
+1. In the Azure Portal, search for **Enterprise applications**
+2. Select your **SSW\.EagleEye.Portal** enterprise app
+3. In the left menu, go to **Manage → Properties**
+4. Set **Assignment required** to **Yes**
+ * This ensures **only the users or groups you assign** can sign in.
+ * If this is set to **No**, *any* user in your tenant will be able to access your EagleEye portal.
+5. Click **Save**
+ 
+
+### Step 2.5 - Assign Users/Groups to the Portal App
+
+1. In the same **SSW\.EagleEye.Portal** enterprise app, go to **Manage → Users and groups**
+2. Click **Add user/group**
+3. Select the users or groups you want to give access to.
+4. Click **Assign**
+ 
diff --git a/content/docs/EagleEye/installation.mdx b/content/docs/EagleEye/step-3-install-from-marketplace.mdx
similarity index 74%
rename from content/docs/EagleEye/installation.mdx
rename to content/docs/EagleEye/step-3-install-from-marketplace.mdx
index 6bbbd93e4..f6dbc473c 100644
--- a/content/docs/EagleEye/installation.mdx
+++ b/content/docs/EagleEye/step-3-install-from-marketplace.mdx
@@ -1,24 +1,19 @@
---
seo:
- title: Installation
- description: Learn how to install EagleEye from Azure Marketplace.
-title: Installation
-date: '2025-07-15T13:00:00.000Z'
+ title: SSW EagleEye - Step 3 Install from Azure Marketplace
+ description: >-
+ Install SSW EagleEye from the Azure Marketplace and complete the
+ deployment wizard, configuring Azure resources, app registrations,
+ database, and Azure OpenAI settings for your environment.
+title: Step 3 - Install From Azure Marketplace
+date: '2025-12-29T13:00:00.000Z'
---
-## Overview
+
-SSW EagleEye is an AI-powered email management solution that helps organizations categorize and process emails automatically using Azure OpenAI. This guide will walk you through the installation process from Azure Marketplace.
+> Tip: Jump to 13:00 for Install from Azure Marketplace
-> 🚨 **Note:** Only proceed with the installation after completing all steps in the [Prerequisites](/docs/prerequisites) guide.
-
-## Installation Process
-
-
-
-### Phase 1: Deploy from Azure Marketplace
-
-#### Step 1: Get SSW EagleEye in Marketplace on Azure Portal
+### Step 3.1 - Get SSW EagleEye in Marketplace on Azure Portal
1. Go to your [Azure Portal](https://portal.azure.com)
2. Search for **Marketplace** in the search bar
@@ -28,11 +23,11 @@ SSW EagleEye is an AI-powered email management solution that helps organizations
4. Select your subscription and click **Create**

-#### Step 2: Configure Application Settings
+### Step 3.2 - Configure Application Settings
Follow the deployment wizard with these configuration steps:
-##### 2.1 Basics
+#### Step 3.2.1 - Basics
* **Resource Group**: Select an existing resource group or create a new one
* **Region**: Choose your preferred Azure region
@@ -40,21 +35,21 @@ Follow the deployment wizard with these configuration steps:

-##### 2.2 Application Configuration
+#### Step 3.2.2 - Application Configuration
* **Project Name**: Unique prefix for all resources
* **Environment**: Select `production` or `staging`

-##### 2.3 Azure AD Configuration
+#### Step 3.2.3 - Azure AD Configuration
* **Azure Tenant ID**: Your Azure AD tenant ID
* **Azure Group Name**: Enter the Azure AD group name for email processing

-##### 2.4 App Registration Configuration
+#### Step 3.2.4 - App Registration Configuration
You need to provide details for the 3 app registrations created in the Prerequisites section:
@@ -65,7 +60,7 @@ You need to provide details for the 3 app registrations created in the Prerequis

-##### 2.5 Database Configuration
+#### Step 3.2.5 - Database Configuration
* **Database Pricing Tier**: Select appropriate tier (Basic, S0, S1, S2)
* **Database Users**: Configure three database users:
@@ -75,7 +70,7 @@ You need to provide details for the 3 app registrations created in the Prerequis

-##### 2.6 Azure OpenAI Configuration
+#### Step 3.2.6 - Azure OpenAI Configuration
* **Location**: Select Azure region (currently East US)
* **Model**: Choose GPT-4.1 Mini or GPT-4o Mini
@@ -83,16 +78,16 @@ You need to provide details for the 3 app registrations created in the Prerequis

-#### Step 3: Review and Deploy
+#### Step 3.2.7 - Review and Deploy
1. Review all configuration settings
2. Click **Create** to start deployment
3. Monitor deployment progress in the Azure Portal
4. Deployment typically takes 15-30 minutes
-### Phase 2: Post-Deployment Configuration
+### Step 3.3 - Post-Deployment Configuration
-#### Step 4: Configure Portal Frontend Redirect URL
+#### Step 3.3.1 - Configure Portal Frontend Redirect URL
After deployment completes, you need to configure the authentication redirect URL:
@@ -105,7 +100,7 @@ After deployment completes, you need to configure the authentication redirect UR
* Example: `https://ca-nextjs-4d33i5xxemxsu.happyfield-d167da8e.australiaeast.azurecontainerapps.io/api/auth/callback/azure-ad`
7. Click **Save**
-#### Step 5: Verify Deployment
+#### Step 3.3.2 - Verify Deployment
1. **Access the Portal**: Navigate to the Portal container app URL
2. **Test Authentication**: Sign in with your Azure AD credentials
@@ -122,14 +117,3 @@ The deployed solution includes:
* **Key Vault**: Secure storage of secrets and configurations
* **Application Insights**: Monitoring and telemetry
* **Container Registry**: Docker image storage
-
-## Next Steps
-
-After successful deployment:
-
-1. Configure Email Tags
-2. [Integrate Power BI report](/docs/integrate-power-bi-report)
-
-## References
-
-* [Azure Marketplace overview](https://learn.microsoft.com/en-us/marketplace/azure-marketplace-overview)
diff --git a/content/docs/EagleEye/integrate-power-bi-report.mdx b/content/docs/EagleEye/step-4-integrate-power-bi-report.mdx
similarity index 67%
rename from content/docs/EagleEye/integrate-power-bi-report.mdx
rename to content/docs/EagleEye/step-4-integrate-power-bi-report.mdx
index ed812c589..f21485c8d 100644
--- a/content/docs/EagleEye/integrate-power-bi-report.mdx
+++ b/content/docs/EagleEye/step-4-integrate-power-bi-report.mdx
@@ -4,33 +4,36 @@ seo:
description: >-
Learn how to set up and integrate Power BI reports in your SSW EagleEye
portal for enhanced data visualisation and insights.
-title: Integrate Power BI report
+title: Step 4 - Integrate Power BI report
date: '2025-11-26T00:00:00.000Z'
---
+
+
+> Tip: Jump to 23:00 for Power BI Integration
+
Follow these simple steps to connect your EagleEye database to the Power BI template app and embed the report into your portal.
1. Go to the [SSW EagleEye - Power BI](https://marketplace.microsoft.com/en-us/product/power-bi/ssw1700450141896.ssweagleeye-power-bi) page on the Microsoft Marketplace
2. Click Get it now and make sure you're signed in with the same Microsoft account used to deploy EagleEye on Azure
3. Click Install
-
+ 
4. Open the app → Connect your data
-
+ 
5. Enter your Database details and click Next:
* Year (e.g., 2025)
* SQL Server URL (e.g., sql-shared-xxx.database.windows.net)
* Database Name (e.g., db-shared-xxx)
- 
+  
6. Enter the Database credentials (read-only username and password created during the EagleEye deployment)
7. Click Sign in and connect. Power BI will load your data
8. Go to File → Embed report → Website or portal.
-
+ 
9. Copy embed link
-
+ 
10. Open your EagleEye Portal → Settings, and paste the link into the Power BI report embed URL field.
-
+ 
11. Click Save.
-
🎉 Your Power BI report should now be visible inside your EagleEye Portal

diff --git a/content/docsTableOfContents/EagleEye/toc.mdx b/content/docsTableOfContents/EagleEye/toc.mdx
index 8fb5e4235..409794ab7 100644
--- a/content/docsTableOfContents/EagleEye/toc.mdx
+++ b/content/docsTableOfContents/EagleEye/toc.mdx
@@ -9,11 +9,22 @@ parentNavigationGroup:
- title: What are Tags?
slug: content/docs/EagleEye/tags.mdx
_template: item
+ - title: Installation
+ items:
- title: Prerequisites
slug: content/docs/EagleEye/prerequisites.mdx
_template: item
- - title: Installation
- slug: content/docs/EagleEye/installation.mdx
+ - title: Step 1 - Azure Setup
+ slug: content/docs/EagleEye/step-1-azure-setup.mdx
+ _template: item
+ - title: Step 2 - App Registrations
+ slug: content/docs/EagleEye/step-2-app-registrations.mdx
+ _template: item
+ - title: Step 3 - Install from Azure Marketplace
+ slug: content/docs/EagleEye/step-3-install-from-marketplace.mdx
+ _template: item
+ - title: Step 4 - Power BI Integration
+ slug: content/docs/EagleEye/step-4-integrate-power-bi-report.mdx
_template: item
- title: Features
items:
@@ -34,9 +45,6 @@ parentNavigationGroup:
- title: Add a new Tag
slug: content/docs/EagleEye/how-to-add-a-new-tag.mdx
_template: item
- - title: Integrate Power BI report
- slug: content/docs/EagleEye/integrate-power-bi-report.mdx
- _template: item
- title: Set report description
slug: content/docs/EagleEye/report-description.mdx
_template: item