feat: Add debug logging for SCIM API requests in ServiceProviderConfig, Users, Individual User, and User management endpoints

feat: Enhance SCIM user update functionality to support user creation and improved error handling
feat: Add SCIMUser and StatusPageSCIMUser models with migration and indexing
2026-04-06 08:42:13 +02:00 · 2025-09-01 18:52:02 +01:00 · 2025-09-01 16:55:34 +01:00 · 2025-09-01 16:38:47 +01:00 · 2025-09-01 16:34:16 +01:00 · 2025-09-01 16:21:37 +01:00
875 changed files with 64324 additions and 41323 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./Accounts/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Accounts/Dockerfile .

  docker-build-isolated-vm:
    runs-on: ubuntu-latest
@@ -38,7 +42,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./IsolatedVM/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./IsolatedVM/Dockerfile .

  docker-build-home:
    runs-on: ubuntu-latest
@@ -53,7 +61,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./Home/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Home/Dockerfile .

  docker-build-worker:
    runs-on: ubuntu-latest
@@ -68,7 +80,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./Worker/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Worker/Dockerfile .

  docker-build-workflow:
    runs-on: ubuntu-latest
@@ -83,7 +99,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./Workflow/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Workflow/Dockerfile .

  docker-build-api-reference:
    runs-on: ubuntu-latest
@@ -98,7 +118,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./APIReference/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./APIReference/Dockerfile .

  docker-build-docs:
    runs-on: ubuntu-latest
@@ -113,7 +137,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./Docs/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Docs/Dockerfile .


  docker-build-otel-collector:
@@ -129,7 +157,11 @@ jobs:
      
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./OTelCollector/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./OTelCollector/Dockerfile .

  docker-build-app:
    runs-on: ubuntu-latest
@@ -145,7 +177,11 @@ jobs:
        
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./App/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./App/Dockerfile .


  docker-build-copilot:
@@ -161,7 +197,11 @@ jobs:

      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./Copilot/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Copilot/Dockerfile .

  docker-build-e2e:
    runs-on: ubuntu-latest
@@ -177,7 +217,11 @@ jobs:
        
      # build image for accounts service
      - name: build docker image
-        run: sudo docker build -f ./E2E/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./E2E/Dockerfile .

  docker-build-admin-dashboard:
    runs-on: ubuntu-latest
@@ -192,7 +236,11 @@ jobs:

      # build image for home
      - name: build docker image
-        run: sudo docker build -f ./AdminDashboard/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./AdminDashboard/Dockerfile .

  docker-build-dashboard:
    runs-on: ubuntu-latest
@@ -207,23 +255,11 @@ jobs:

      # build image for home
      - name: build docker image
-        run: sudo docker build -f ./Dashboard/Dockerfile .
-
-  docker-build-haraka:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v4
-
-      - name: Preinstall 
-        run: npm run prerun
-        
-      # build images
-      - name: build docker image
-        run: sudo docker build -f ./Haraka/Dockerfile .
-
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Dashboard/Dockerfile .

  docker-build-probe:
    runs-on: ubuntu-latest
@@ -238,7 +274,11 @@ jobs:
        
      # build image probe api
      - name: build docker image
-        run: sudo docker build -f ./Probe/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./Probe/Dockerfile .

  docker-build-probe-ingest:
    runs-on: ubuntu-latest
@@ -253,7 +293,11 @@ jobs:
        
      # build image probe api
      - name: build docker image
-        run: sudo docker build -f ./ProbeIngest/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./ProbeIngest/Dockerfile .

  docker-build-server-monitor-ingest:
    runs-on: ubuntu-latest
@@ -268,7 +312,11 @@ jobs:
        
      # build image probe api
      - name: build docker image
-        run: sudo docker build -f ./ServerMonitorIngest/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./ServerMonitorIngest/Dockerfile .

  docker-build-open-telemetry-ingest:
    runs-on: ubuntu-latest
@@ -283,7 +331,11 @@ jobs:
        
      # build image probe api
      - name: build docker image
-        run: sudo docker build -f ./OpenTelemetryIngest/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./OpenTelemetryIngest/Dockerfile .

  docker-build-incoming-request-ingest:
    runs-on: ubuntu-latest
@@ -298,7 +350,11 @@ jobs:
        
      # build image probe api
      - name: build docker image
-        run: sudo docker build -f ./IncomingRequestIngest/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./IncomingRequestIngest/Dockerfile .

  docker-build-fluent-ingest:
    runs-on: ubuntu-latest
@@ -313,7 +369,11 @@ jobs:
        
      # build image probe api
      - name: build docker image
-        run: sudo docker build -f ./FluentIngest/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./FluentIngest/Dockerfile .

  docker-build-status-page:
    runs-on: ubuntu-latest
@@ -328,7 +388,11 @@ jobs:
        
      # build image for home
      - name: build docker image
-        run: sudo docker build -f ./StatusPage/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./StatusPage/Dockerfile .

  docker-build-test-server:
    runs-on: ubuntu-latest
@@ -343,4 +407,8 @@ jobs:

      # build image for mail service
      - name: build docker image
-        run: sudo docker build -f ./TestServer/Dockerfile .
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 45
+          max_attempts: 3
+          command: sudo docker build -f ./TestServer/Dockerfile .
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -20,7 +20,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd Accounts && npm install && npm run compile && npm run dep-check
+      - name: Compile Accounts
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Accounts && npm install && npm run compile && npm run dep-check

  compile-isolated-vm:
    runs-on: ubuntu-latest
@@ -32,7 +37,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check
+      - name: Compile IsolatedVM
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd IsolatedVM && npm install && npm run compile && npm run dep-check

  compile-common:
    runs-on: ubuntu-latest
@@ -43,7 +53,12 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: latest
-      - run: cd Common && npm install && npm run compile && npm run dep-check
+      - name: Compile Common
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Common && npm install && npm run compile && npm run dep-check

  compile-app:
    runs-on: ubuntu-latest
@@ -55,7 +70,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd App && npm install && npm run compile && npm run dep-check
+      - name: Compile App
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd App && npm install && npm run compile && npm run dep-check

  compile-home:
    runs-on: ubuntu-latest
@@ -67,7 +87,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd Home && npm install && npm run compile && npm run dep-check
+      - name: Compile Home
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Home && npm install && npm run compile && npm run dep-check

  compile-worker:
    runs-on: ubuntu-latest
@@ -79,7 +104,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd Worker && npm install && npm run compile && npm run dep-check
+      - name: Compile Worker
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Worker && npm install && npm run compile && npm run dep-check

  compile-workflow:
    runs-on: ubuntu-latest
@@ -91,7 +121,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd Workflow && npm install && npm run compile && npm run dep-check
+      - name: Compile Workflow
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Workflow && npm install && npm run compile && npm run dep-check

  compile-api-reference:
    runs-on: ubuntu-latest
@@ -103,7 +138,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd APIReference && npm install && npm run compile && npm run dep-check
+      - name: Compile API Reference
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd APIReference && npm install && npm run compile && npm run dep-check

  compile-docs-reference:
    runs-on: ubuntu-latest
@@ -115,7 +155,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd Docs && npm install && npm run compile && npm run dep-check
+      - name: Compile Docs Reference
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Docs && npm install && npm run compile && npm run dep-check

  compile-copilot:
    runs-on: ubuntu-latest
@@ -127,7 +172,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd Copilot && npm install && npm run compile && npm run dep-check
+      - name: Compile Copilot
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Copilot && npm install && npm run compile && npm run dep-check

  compile-nginx:
    runs-on: ubuntu-latest
@@ -140,7 +190,12 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - run: cd Nginx && npm install && npm run compile && npm run dep-check
+      - name: Compile Nginx
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Nginx && npm install && npm run compile && npm run dep-check

  compile-infrastructure-agent:
    runs-on: ubuntu-latest
@@ -150,7 +205,12 @@ jobs:
      - uses: actions/checkout@v4
      # Setup Go
      - uses: actions/setup-go@v5
-      - run: cd InfrastructureAgent && go build .
+      - name: Compile Infrastructure Agent
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd InfrastructureAgent && go build .
  

  compile-admin-dashboard:
@@ -164,7 +224,12 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - run: cd AdminDashboard && npm install && npm run compile && npm run dep-check
+      - name: Compile Admin Dashboard
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd AdminDashboard && npm install && npm run compile && npm run dep-check

  compile-dashboard:
    runs-on: ubuntu-latest
@@ -177,7 +242,12 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - run: cd Dashboard && npm install && npm run compile && npm run dep-check
+      - name: Compile Dashboard
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Dashboard && npm install && npm run compile && npm run dep-check


  compile-e2e:
@@ -191,7 +261,12 @@ jobs:
          node-version: latest
      - run: sudo apt-get update
      - run: cd Common && npm install
-      - run: cd E2E && npm install && npm run compile && npm run dep-check
+      - name: Compile E2E
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd E2E && npm install && npm run compile && npm run dep-check

  compile-probe:
    runs-on: ubuntu-latest
@@ -203,7 +278,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd Probe && npm install && npm run compile && npm run dep-check
+      - name: Compile Probe
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd Probe && npm install && npm run compile && npm run dep-check

  compile-probe-ingest:
    runs-on: ubuntu-latest
@@ -215,7 +295,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd ProbeIngest && npm install && npm run compile && npm run dep-check
+      - name: Compile Probe Ingest
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd ProbeIngest && npm install && npm run compile && npm run dep-check

  compile-server-monitor-ingest:
    runs-on: ubuntu-latest
@@ -227,7 +312,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd ServerMonitorIngest && npm install && npm run compile && npm run dep-check
+      - name: Compile Server Monitor Ingest
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd ServerMonitorIngest && npm install && npm run compile && npm run dep-check

  compile-open-telemetry-ingest:
    runs-on: ubuntu-latest
@@ -239,7 +329,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd OpenTelemetryIngest && npm install && npm run compile && npm run dep-check
+      - name: Compile Open Telemetry Ingest
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd OpenTelemetryIngest && npm install && npm run compile && npm run dep-check


  compile-incoming-request-ingest: 
@@ -252,7 +347,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd IncomingRequestIngest && npm install && npm run compile && npm run dep-check
+      - name: Compile Incoming Request Ingest
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd IncomingRequestIngest && npm install && npm run compile && npm run dep-check

  compile-fluent-ingest:
    runs-on: ubuntu-latest
@@ -264,7 +364,12 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd FluentIngest && npm install && npm run compile && npm run dep-check
+      - name: Compile Fluent Ingest
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd FluentIngest && npm install && npm run compile && npm run dep-check
  

  compile-status-page:
@@ -278,7 +383,12 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - run: cd StatusPage && npm install && npm run compile && npm run dep-check
+      - name: Compile Status Page
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd StatusPage && npm install && npm run compile && npm run dep-check

  compile-test-server:
    runs-on: ubuntu-latest
@@ -290,4 +400,26 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - run: cd TestServer && npm install && npm run compile && npm run dep-check
+      - name: Compile Test Server
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd TestServer && npm install && npm run compile && npm run dep-check
+
+  compile-mcp:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd Common && npm install
+      - name: Compile MCP
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd MCP && npm install && npm run compile && npm run dep-check
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
--- a/.github/workflows/terraform-provider-generation.yml
+++ b/.github/workflows/terraform-provider-generation.yml
@@ -77,17 +77,21 @@ jobs:
          ls -la "$PROVIDER_DIR" || true

      - name: Test Go build
-        run: |
-          PROVIDER_DIR="./Terraform"
-          if [ -d "$PROVIDER_DIR" ] && [ -f "$PROVIDER_DIR/go.mod" ]; then
-            cd "$PROVIDER_DIR"
-            echo "🔨 Testing Go build..."
-            go mod tidy
-            go build -v ./...
-            echo "✅ Go build successful"
-          else
-            echo "⚠️ Cannot test build - missing go.mod or provider directory"
-          fi
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: |
+            PROVIDER_DIR="./Terraform"
+            if [ -d "$PROVIDER_DIR" ] && [ -f "$PROVIDER_DIR/go.mod" ]; then
+              cd "$PROVIDER_DIR"
+              echo "🔨 Testing Go build..."
+              go mod tidy
+              go build -v ./...
+              echo "✅ Go build successful"
+            else
+              echo "⚠️ Cannot test build - missing go.mod or provider directory"
+            fi

      - name: Upload Terraform provider as artifact
        uses: actions/upload-artifact@v4
--- a/.github/workflows/test-release.yaml
+++ b/.github/workflows/test-release.yaml
--- a/.github/workflows/test.mcp.yaml
+++ b/.github/workflows/test.mcp.yaml
@@ -0,0 +1,21 @@
+name: MCP Server Test
+
+on:
+  pull_request: 
+  push:
+    branches-ignore:
+      - 'hotfix-*'   # excludes hotfix branches
+      - 'release'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest 
+      - run: cd Common && npm install
+      - run: cd MCP && npm install && npm run test
--- a/.gitignore
+++ b/.gitignore
@@ -86,9 +86,6 @@ Backups/*.tar

 .env

-Haraka/dkim/keys/private_base64.txt
-Haraka/dkim/keys/public_base64.txt
-
 .eslintcache

 HelmChart/Values/*.values.yaml
@@ -119,4 +116,15 @@ InfrastructureAgent/oneuptime-infrastructure-agent
 # Terraform generated files
 openapi.json

-Terraform/**
+Terraform/**
+
+TerraformTest/**
+
+terraform-provider-example/**
+
+# MCP Server
+MCP/build/
+MCP/.env
+MCP/node_modules 
+Dashboard/public/sw.js
+.claude/settings.local.json
--- a/APIReference/CodeExamples/DataTypes/EqualTo.md
+++ b/APIReference/CodeExamples/DataTypes/EqualTo.md
@@ -1,6 +1,8 @@
 {
    "query": {
-        "name": "Hello", 
-        // other filters
+        "age": {
+            "_type": "EqualTo",
+            value: 10
+        }
    }
 }
--- a/APIReference/CodeExamples/DataTypes/Includes.md
+++ b/APIReference/CodeExamples/DataTypes/Includes.md
@@ -0,0 +1,11 @@
+{
+    "query": {
+        "labels": {
+            "_type": "Includes",
+            "value": [
+                "aaa00000-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+                "bbb00000-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+            ]
+        }
+    }
+}
--- a/APIReference/Dockerfile.tpl
+++ b/APIReference/Dockerfile.tpl
@@ -65,6 +65,8 @@ CMD [ "npm", "run", "dev" ]
 COPY ./APIReference /usr/src/app
 # Bundle app source
 RUN npm run compile
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}
--- a/APIReference/Service/DataType.ts
+++ b/APIReference/Service/DataType.ts
@@ -88,6 +88,16 @@ export default class ServiceHandler {
      },
    );

+    pageData.includesCode = await LocalCache.getOrSetString(
+      "data-type",
+      "includes",
+      async () => {
+        return await LocalFile.read(
+          `${CodeExamplesPath}/DataTypes/Includes.md`,
+        );
+      },
+    );
+
    pageData.lessThanOrNullCode = await LocalCache.getOrSetString(
      "data-type",
      "less-than-or-equal",
--- a/APIReference/nodemon.json
+++ b/APIReference/nodemon.json
@@ -4,5 +4,7 @@
    "ignore": [
        "greenlock.d/*"
    ],
-    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
+    "watchOptions": {"useFsEvents": false, "interval": 500},
+    "env": {"TS_NODE_TRANSPILE_ONLY": "1", "TS_NODE_FILES": "false"},
+    "exec": "node --inspect=0.0.0.0:9229 -r ts-node/register/transpile-only Index.ts"
 }
--- a/APIReference/package-lock.json
+++ b/APIReference/package-lock.json
@@ -1,17 +1,16 @@
 {
-  "name": "@oneuptime/app",
+  "name": "@oneuptime/api-reference",
  "version": "1.0.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
-      "name": "@oneuptime/app",
+      "name": "@oneuptime/api-reference",
      "version": "1.0.0",
      "license": "Apache-2.0",
      "dependencies": {
        "Common": "file:../Common",
        "ejs": "^3.1.9",
-        "handlebars": "^4.7.8",
        "ts-node": "^10.9.1"
      },
      "devDependencies": {
@@ -26,8 +25,9 @@
      "version": "1.0.0",
      "license": "Apache-2.0",
      "dependencies": {
+        "@asteasolutions/zod-to-openapi": "^7.3.2",
        "@bull-board/express": "^5.21.4",
-        "@clickhouse/client": "^0.2.10",
+        "@clickhouse/client": "^1.10.1",
        "@elastic/elasticsearch": "^8.12.1",
        "@monaco-editor/react": "^4.4.6",
        "@opentelemetry/api": "^1.9.0",
@@ -55,18 +55,19 @@
        "@types/react-highlight": "^0.12.8",
        "@types/react-syntax-highlighter": "^15.5.13",
        "@types/uuid": "^8.3.4",
+        "@types/web-push": "^3.6.4",
        "acme-client": "^5.3.0",
        "airtable": "^0.12.2",
        "axios": "^1.7.2",
        "bullmq": "^5.3.3",
-        "Common": "file:../Common",
-        "cookie-parser": "^1.4.6",
+        "cookie-parser": "^1.4.7",
        "cors": "^2.8.5",
        "cron-parser": "^4.8.1",
        "crypto-js": "^4.2.0",
        "dotenv": "^16.4.4",
        "ejs": "^3.1.10",
-        "express": "^4.19.2",
+        "esbuild": "^0.25.5",
+        "express": "^4.21.1",
        "formik": "^2.4.6",
        "history": "^5.3.0",
        "ioredis": "^5.3.2",
@@ -74,7 +75,6 @@
        "json5": "^2.2.3",
        "jsonwebtoken": "^9.0.0",
        "jwt-decode": "^4.0.0",
-        "lodash": "^4.17.21",
        "marked": "^12.0.2",
        "moment": "^2.30.1",
        "moment-timezone": "^0.5.45",
@@ -82,6 +82,7 @@
        "nodemailer": "^6.9.10",
        "otpauth": "^9.3.1",
        "pg": "^8.7.3",
+        "playwright": "^1.50.0",
        "posthog-js": "^1.139.6",
        "prop-types": "^15.8.1",
        "qrcode": "^1.5.3",
@@ -104,6 +105,7 @@
        "redis-semaphore": "^5.5.1",
        "reflect-metadata": "^0.2.2",
        "remark-gfm": "^3.0.1",
+        "slackify-markdown": "^4.4.0",
        "slugify": "^1.6.5",
        "socket.io": "^4.7.4",
        "socket.io-client": "^4.7.5",
@@ -113,9 +115,11 @@
        "twilio": "^4.22.0",
        "typeorm": "^0.3.20",
        "typeorm-extension": "^2.2.13",
-        "universal-cookie": "^4.0.4",
+        "universal-cookie": "^7.2.1",
        "use-async-effect": "^2.2.6",
-        "uuid": "^8.3.2"
+        "uuid": "^8.3.2",
+        "web-push": "^3.6.7",
+        "zod": "^3.25.30"
      },
      "devDependencies": {
        "@faker-js/faker": "^8.0.2",
@@ -129,7 +133,6 @@
        "@types/jest": "^28.1.4",
        "@types/json2csv": "^5.0.3",
        "@types/jsonwebtoken": "^8.5.9",
-        "@types/lodash": "^4.14.202",
        "@types/node": "^17.0.45",
        "@types/node-cron": "^3.0.7",
        "@types/nodemailer": "^6.4.7",
@@ -143,6 +146,7 @@
        "jest-environment-jsdom": "^29.7.0",
        "jest-mock-extended": "^3.0.5",
        "react-test-renderer": "^18.2.0",
+        "sass": "^1.89.2",
        "ts-jest": "^28.0.5"
      }
    },
@@ -2378,26 +2382,6 @@
      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
      "dev": true
    },
-    "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
    "node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -3445,14 +3429,6 @@
        "node": "*"
      }
    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3465,11 +3441,6 @@
      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
      "dev": true
    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-    },
    "node_modules/node-int64": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -3961,6 +3932,7 @@
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -4243,18 +4215,6 @@
        "node": ">=14.17"
      }
    },
-    "node_modules/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
    "node_modules/undefsafe": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
@@ -4340,11 +4300,6 @@
        "node": ">= 8"
      }
    },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="
-    },
    "node_modules/wrap-ansi": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
--- a/APIReference/views/main/data-types.ejs
+++ b/APIReference/views/main/data-types.ejs
@@ -115,7 +115,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of Equal To Query</p>
+                                    <p>Here is an example of an Equal To Query</p>
                                </dd>
                            </dl>
                        </li>
@@ -153,7 +153,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of Not Equal To Query</p>
+                                    <p>Here is an example of a Not Equal To Query</p>
                                </dd>
                            </dl>
                        </li>
@@ -191,7 +191,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of is null query</p>
+                                    <p>Here is an example of an is null query</p>
                                </dd>
                            </dl>
                        </li>
@@ -229,7 +229,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of is not null query</p>
+                                    <p>Here is an example of an is not null query</p>
                                </dd>
                            </dl>
                        </li>
@@ -266,7 +266,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of greater than query</p>
+                                    <p>Here is an example of a greater than query</p>
                                </dd>
                            </dl>
                        </li>
@@ -304,7 +304,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of greater or equal than query</p>
+                                    <p>Here is an example of a greater than or equal query</p>
                                </dd>
                            </dl>
                        </li>
@@ -342,7 +342,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of less than query</p>
+                                    <p>Here is an example of a less than query</p>
                                </dd>
                            </dl>
                        </li>
@@ -380,7 +380,7 @@
                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                <dt class="sr-only">Description</dt>
                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of less or equal than query</p>
+                                    <p>Here is an example of a less than or equal query</p>
                                </dd>
                            </dl>
                        </li>
@@ -395,5 +395,44 @@
            </div>
        </div>

+        <h3 id="example-using-cursors" class="scroll-mt-24">
+            Inlcudes
+        </h3>
+
+        <div class="grid grid-cols-1 items-start gap-x-16 gap-y-10 xl:max-w-none xl:grid-cols-2">
+            <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                <p> 
+                    Includes will get objects that match any of the values in the array. It is used to
+                    filter objects that have a field that matches any of the values in the array. For example, if you
+                    want to get all objects that have a label with ID `aaa00000-aaaa-aaaa-aaaa-aaaaaaaaaaaa` or
+                    `bbb00000-bbbb-bbbb-bbbb-bbbbbbbbbbbb`, you can use the `includes` query type.
+                </p>
+
+                <div class="my-6">
+                    <ul role="list"
+                        class="m-0 max-w-[calc(theme(maxWidth.lg)-theme(spacing.8))] list-none divide-y divide-zinc-900/5 p-0 ">
+                        <li class="m-0 px-0 py-4 first:pt-0 last:pb-0">
+                            <dl class="m-0 flex flex-wrap items-center gap-x-3 gap-y-2">
+                                <dt class="sr-only">Query</dt>
+                                <dd><code class="inline-code">query</code></dd>
+                                <dt class="sr-only">Type</dt>
+                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
+                                <dt class="sr-only">Description</dt>
+                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                                    <p>Here is an example of a less than or equal query</p>
+                                </dd>
+                            </dl>
+                        </li>
+
+                    </ul>
+                </div>
+            </div>
+            <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                <%- include('../partials/code', {title: "Example Not EqualTo Request Body" , requestUrl: "" , requestType: "" ,
+                    code: pageData.includesCode }) -%>
+
+            </div>
+        </div>
+
    </article>
 </main>
--- a/APIReference/views/main/pagination.ejs
+++ b/APIReference/views/main/pagination.ejs
@@ -13,7 +13,7 @@
      </h2>
      <div class="grid grid-cols-1 items-start gap-x-16 gap-y-10 xl:max-w-none xl:grid-cols-2">
         <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-            <p>In this example, we request the list fo monitors. As a result, we get a list of three monitors and can
+            <p>In this example, we request the list of monitors. As a result, we get a list of three monitors and can
               tell by the <code class="inline-code">count</code> attribute that we have reached the end of the
               result set</p>
               <h2 id="example-using-cursors" class="scroll-mt-24">
--- a/APIReference/views/partials/head.ejs
+++ b/APIReference/views/partials/head.ejs
@@ -135,7 +135,6 @@
   <link rel="apple-touch-icon-precomposed" href="/img/ou-wb.svg">
   <link rel="icon" href="/img/ou-wb.svg">
   <link rel="image_src" type="image/png" href="/img/hou-wb.svg">
-   <link rel="canonical" href="/">
   <link rel="manifest" href="/manifest.json">
   <meta property="og:title" content="OneUptime - One Complete Observability platform.">
   <meta property="og:url" content="https://oneuptime.com">
--- a/Accounts/Dockerfile.tpl
+++ b/Accounts/Dockerfile.tpl
@@ -83,6 +83,8 @@ COPY ./Accounts /usr/src/app
 # Bundle app source

 RUN npm run build
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}
--- a/Accounts/package-lock.json
+++ b/Accounts/package-lock.json
@@ -59,6 +59,7 @@
                "@types/react-highlight": "^0.12.8",
                "@types/react-syntax-highlighter": "^15.5.13",
                "@types/uuid": "^8.3.4",
+                "@types/web-push": "^3.6.4",
                "acme-client": "^5.3.0",
                "airtable": "^0.12.2",
                "axios": "^1.7.2",
@@ -78,7 +79,6 @@
                "json5": "^2.2.3",
                "jsonwebtoken": "^9.0.0",
                "jwt-decode": "^4.0.0",
-                "lodash": "^4.17.21",
                "marked": "^12.0.2",
                "moment": "^2.30.1",
                "moment-timezone": "^0.5.45",
@@ -122,6 +122,7 @@
                "universal-cookie": "^7.2.1",
                "use-async-effect": "^2.2.6",
                "uuid": "^8.3.2",
+                "web-push": "^3.6.7",
                "zod": "^3.25.30"
            },
            "devDependencies": {
@@ -136,7 +137,6 @@
                "@types/jest": "^28.1.4",
                "@types/json2csv": "^5.0.3",
                "@types/jsonwebtoken": "^8.5.9",
-                "@types/lodash": "^4.14.202",
                "@types/node": "^17.0.45",
                "@types/node-cron": "^3.0.7",
                "@types/nodemailer": "^6.4.7",
--- a/AdminDashboard/Dockerfile.tpl
+++ b/AdminDashboard/Dockerfile.tpl
@@ -79,6 +79,8 @@ CMD [ "npm", "run", "dev" ]
 COPY ./AdminDashboard /usr/src/app
 # Bundle app source
 RUN npm run build
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}
--- a/AdminDashboard/package-lock.json
+++ b/AdminDashboard/package-lock.json
@@ -58,6 +58,7 @@
                "@types/react-highlight": "^0.12.8",
                "@types/react-syntax-highlighter": "^15.5.13",
                "@types/uuid": "^8.3.4",
+                "@types/web-push": "^3.6.4",
                "acme-client": "^5.3.0",
                "airtable": "^0.12.2",
                "axios": "^1.7.2",
@@ -77,7 +78,6 @@
                "json5": "^2.2.3",
                "jsonwebtoken": "^9.0.0",
                "jwt-decode": "^4.0.0",
-                "lodash": "^4.17.21",
                "marked": "^12.0.2",
                "moment": "^2.30.1",
                "moment-timezone": "^0.5.45",
@@ -121,6 +121,7 @@
                "universal-cookie": "^7.2.1",
                "use-async-effect": "^2.2.6",
                "uuid": "^8.3.2",
+                "web-push": "^3.6.7",
                "zod": "^3.25.30"
            },
            "devDependencies": {
@@ -135,7 +136,6 @@
                "@types/jest": "^28.1.4",
                "@types/json2csv": "^5.0.3",
                "@types/jsonwebtoken": "^8.5.9",
-                "@types/lodash": "^4.14.202",
                "@types/node": "^17.0.45",
                "@types/node-cron": "^3.0.7",
                "@types/nodemailer": "^6.4.7",
--- a/AdminDashboard/src/Components/Footer/Footer.tsx
+++ b/AdminDashboard/src/Components/Footer/Footer.tsx
@@ -67,7 +67,7 @@ const DashboardFooter: () => JSX.Element = () => {
  return (
    <>
      <Footer
-        className="bg-white h-16 inset-x-0 bottom-0 px-8"
+        className="bg-white px-8"
        copyright="HackerBay, Inc."
        links={[
          {
--- a/AdminDashboard/src/Components/NavBar/NavBar.tsx
+++ b/AdminDashboard/src/Components/NavBar/NavBar.tsx
@@ -2,36 +2,33 @@ import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
-import NavBar from "Common/UI/Components/Navbar/NavBar";
-import NavBarItem from "Common/UI/Components/Navbar/NavBarItem";
+import NavBar, { NavItem } from "Common/UI/Components/Navbar/NavBar";
 import React, { FunctionComponent, ReactElement } from "react";

 const DashboardNavbar: FunctionComponent = (): ReactElement => {
-  return (
-    <NavBar>
-      <NavBarItem
-        title="Users"
-        icon={IconProp.User}
-        route={RouteUtil.populateRouteParams(RouteMap[PageMap.USERS] as Route)}
-      ></NavBarItem>
+  // Build the navigation items
+  const navItems: NavItem[] = [
+    {
+      id: "users-nav-bar-item",
+      title: "Users",
+      icon: IconProp.User,
+      route: RouteUtil.populateRouteParams(RouteMap[PageMap.USERS] as Route),
+    },
+    {
+      id: "projects-nav-bar-item",
+      title: "Projects",
+      icon: IconProp.Folder,
+      route: RouteUtil.populateRouteParams(RouteMap[PageMap.PROJECTS] as Route),
+    },
+    {
+      id: "settings-nav-bar-item",
+      title: "Settings",
+      icon: IconProp.Settings,
+      route: RouteUtil.populateRouteParams(RouteMap[PageMap.SETTINGS] as Route),
+    },
+  ];

-      <NavBarItem
-        title="Projects"
-        icon={IconProp.Folder}
-        route={RouteUtil.populateRouteParams(
-          RouteMap[PageMap.PROJECTS] as Route,
-        )}
-      ></NavBarItem>
-
-      <NavBarItem
-        title="Settings"
-        icon={IconProp.Settings}
-        route={RouteUtil.populateRouteParams(
-          RouteMap[PageMap.SETTINGS] as Route,
-        )}
-      ></NavBarItem>
-    </NavBar>
-  );
+  return <NavBar items={navItems} />;
 };

 export default DashboardNavbar;
--- a/AdminDashboard/src/Pages/Projects/Index.tsx
+++ b/AdminDashboard/src/Pages/Projects/Index.tsx
@@ -241,6 +241,7 @@ const Projects: FunctionComponent = (): ReactElement => {
            },
            title: "Created At",
            type: FieldType.DateTime,
+            hideOnMobile: true,
          },
        ]}
        userPreferencesKey="admin-projects-table"
--- a/AdminDashboard/src/Pages/Settings/Email/Index.tsx
+++ b/AdminDashboard/src/Pages/Settings/Email/Index.tsx
@@ -21,7 +21,7 @@ import React, { FunctionComponent, ReactElement, useEffect } from "react";

 const Settings: FunctionComponent = (): ReactElement => {
  const [emailServerType, setemailServerType] = React.useState<EmailServerType>(
-    EmailServerType.Internal,
+    EmailServerType.CustomSMTP,
  );

  const [isLoading, setIsLoading] = React.useState<boolean>(true);
@@ -43,7 +43,7 @@ const Settings: FunctionComponent = (): ReactElement => {

    if (globalConfig) {
      setemailServerType(
-        globalConfig.emailServerType || EmailServerType.Internal,
+        globalConfig.emailServerType || EmailServerType.CustomSMTP,
      );
    }

@@ -127,7 +127,7 @@ const Settings: FunctionComponent = (): ReactElement => {
      />

      <CardModelDetail
-        name="Internal SMTP Settings"
+        name="Email Server Settings"
        cardProps={{
          title: "Email Server Settings",
          description:
@@ -172,7 +172,7 @@ const Settings: FunctionComponent = (): ReactElement => {
          cardProps={{
            title: "Custom Email and SMTP Settings",
            description:
-              "If you have not enabled Internal SMTP server to send emails. Please configure your SMTP server here.",
+              "Please configure your SMTP server here to send emails.",
          }}
          isEditable={true}
          editButtonText="Edit SMTP Config"
--- a/AdminDashboard/src/Pages/Settings/Probes/Index.tsx
+++ b/AdminDashboard/src/Pages/Settings/Probes/Index.tsx
@@ -54,6 +54,7 @@ const Settings: FunctionComponent = (): ReactElement => {
        title="Need help with setting up Global Probes?"
        description="Here is a guide which will help you get set up"
        link={Route.fromString("/docs/probe/custom-probe")}
+        hideOnMobile={true}
      />

      <ModelTable<Probe>
@@ -174,6 +175,7 @@ const Settings: FunctionComponent = (): ReactElement => {
            noValueMessage: "-",
            title: "Description",
            type: FieldType.LongText,
+            hideOnMobile: true,
          },
          {
            field: {
@@ -181,6 +183,7 @@ const Settings: FunctionComponent = (): ReactElement => {
            },
            title: "Status",
            type: FieldType.Text,
+
            getElement: (item: Probe): ReactElement => {
              if (
                item &&
--- a/AdminDashboard/src/Pages/Users/Index.tsx
+++ b/AdminDashboard/src/Pages/Users/Index.tsx
@@ -116,6 +116,7 @@ const Users: FunctionComponent = (): ReactElement => {
            },
            title: "Email Verified",
            type: FieldType.Boolean,
+            hideOnMobile: true,
          },
          {
            field: {
@@ -123,6 +124,7 @@ const Users: FunctionComponent = (): ReactElement => {
            },
            title: "Created At",
            type: FieldType.DateTime,
+            hideOnMobile: true,
          },
        ]}
      />
--- a/App/Dockerfile.tpl
+++ b/App/Dockerfile.tpl
@@ -65,6 +65,8 @@ CMD [ "npm", "run", "dev" ]
 COPY ./App /usr/src/app
 # Bundle app source
 RUN npm run compile
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}
--- a/App/FeatureSet/BaseAPI/Index.ts
+++ b/App/FeatureSet/BaseAPI/Index.ts
@@ -29,6 +29,7 @@ import MonitorTest from "Common/Models/DatabaseModels/MonitorTest";
 import UserEmailAPI from "Common/Server/API/UserEmailAPI";
 import UserNotificationLogTimelineAPI from "Common/Server/API/UserOnCallLogTimelineAPI";
 import UserSMSAPI from "Common/Server/API/UserSmsAPI";
+import UserPushAPI from "Common/Server/API/UserPushAPI";
 import ApiKeyPermissionService, {
  Service as ApiKeyPermissionServiceType,
 } from "Common/Server/Services/ApiKeyPermissionService";
@@ -281,6 +282,9 @@ import ShortLinkService, {
 import SmsLogService, {
  Service as SmsLogServiceType,
 } from "Common/Server/Services/SmsLogService";
+import PushNotificationLogService, {
+  Service as PushNotificationLogServiceType,
+} from "Common/Server/Services/PushNotificationLogService";
 import SpanService, {
  SpanService as SpanServiceType,
 } from "Common/Server/Services/SpanService";
@@ -378,6 +382,8 @@ import Span from "Common/Models/AnalyticsModels/Span";
 import ApiKey from "Common/Models/DatabaseModels/ApiKey";
 import ApiKeyPermission from "Common/Models/DatabaseModels/ApiKeyPermission";
 import CallLog from "Common/Models/DatabaseModels/CallLog";
+import PushNotificationLog from "Common/Models/DatabaseModels/PushNotificationLog";
+import WorkspaceNotificationLog from "Common/Models/DatabaseModels/WorkspaceNotificationLog";
 import Domain from "Common/Models/DatabaseModels/Domain";
 import EmailLog from "Common/Models/DatabaseModels/EmailLog";
 import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
@@ -479,6 +485,9 @@ import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute
 import ExceptionInstance from "Common/Models/AnalyticsModels/ExceptionInstance";
 import TelemetyException from "Common/Models/DatabaseModels/TelemetryException";
 import CopilotActionTypePriority from "Common/Models/DatabaseModels/CopilotActionTypePriority";
+import WorkspaceNotificationLogService, {
+  Service as WorkspaceNotificationLogServiceType,
+} from "Common/Server/Services/WorkspaceNotificationLogService";

 // scheduled maintenance template
 import ScheduledMaintenanceTemplate from "Common/Models/DatabaseModels/ScheduledMaintenanceTemplate";
@@ -529,11 +538,6 @@ import WorkspaceSettingService, {
  Service as WorkspaceSettingServiceType,
 } from "Common/Server/Services/WorkspaceSettingService";

-import ProjectUser from "Common/Models/DatabaseModels/ProjectUser";
-import ProjectUserService, {
-  Service as ProjectUserServiceType,
-} from "Common/Server/Services/ProjectUserService";
-
 import MonitorFeed from "Common/Models/DatabaseModels/MonitorFeed";
 import MonitorFeedService, {
  Service as MonitorFeedServiceType,
@@ -582,6 +586,18 @@ import StatusPageAnnouncementTemplateService, {
  Service as StatusPageAnnouncementTemplateServiceType,
 } from "Common/Server/Services/StatusPageAnnouncementTemplateService";

+// ProjectSCIM
+import ProjectSCIM from "Common/Models/DatabaseModels/ProjectSCIM";
+import ProjectSCIMService, {
+  Service as ProjectSCIMServiceType,
+} from "Common/Server/Services/ProjectSCIMService";
+
+// StatusPageSCIM
+import StatusPageSCIM from "Common/Models/DatabaseModels/StatusPageSCIM";
+import StatusPageSCIMService, {
+  Service as StatusPageSCIMServiceType,
+} from "Common/Server/Services/StatusPageSCIMService";
+
 // Open API Spec
 import OpenAPI from "Common/Server/API/OpenAPI";

@@ -617,6 +633,24 @@ const BaseAPIFeatureSet: FeatureSet = {
      ).getRouter(),
    );

+    // Project SCIM
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<ProjectSCIM, ProjectSCIMServiceType>(
+        ProjectSCIM,
+        ProjectSCIMService,
+      ).getRouter(),
+    );
+
+    // Status Page SCIM
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<StatusPageSCIM, StatusPageSCIMServiceType>(
+        StatusPageSCIM,
+        StatusPageSCIMService,
+      ).getRouter(),
+    );
+
    // status page announcement templates
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
@@ -697,14 +731,6 @@ const BaseAPIFeatureSet: FeatureSet = {
      ).getRouter(),
    );

-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAPI<ProjectUser, ProjectUserServiceType>(
-        ProjectUser,
-        ProjectUserService,
-      ).getRouter(),
-    );
-
    //service provider setting
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1500,6 +1526,22 @@ const BaseAPIFeatureSet: FeatureSet = {
      new BaseAPI<SmsLog, SmsLogServiceType>(SmsLog, SmsLogService).getRouter(),
    );

+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<PushNotificationLog, PushNotificationLogServiceType>(
+        PushNotificationLog,
+        PushNotificationLogService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        WorkspaceNotificationLog,
+        WorkspaceNotificationLogServiceType
+      >(WorkspaceNotificationLog, WorkspaceNotificationLogService).getRouter(),
+    );
+
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
      new BaseAPI<EmailLog, EmailLogServiceType>(
@@ -1608,6 +1650,7 @@ const BaseAPIFeatureSet: FeatureSet = {
    );
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserEmailAPI().getRouter());
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserSMSAPI().getRouter());
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserPushAPI().getRouter());
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new ProbeAPI().getRouter());

    app.use(
--- a/App/FeatureSet/Identity/API/SCIM.ts
+++ b/App/FeatureSet/Identity/API/SCIM.ts
--- a/App/FeatureSet/Identity/API/StatusPageAuthentication.ts
+++ b/App/FeatureSet/Identity/API/StatusPageAuthentication.ts
@@ -168,6 +168,7 @@ router.post(
          },
          {
            projectId: statusPage.projectId!,
+            statusPageId: statusPage.id!,
          },
        ).catch((err: Error) => {
          logger.error(err);
@@ -306,6 +307,7 @@ router.post(
        },
        {
          projectId: statusPage.projectId!,
+          statusPageId: statusPage.id!,
        },
      ).catch((err: Error) => {
        logger.error(err);
--- a/App/FeatureSet/Identity/API/StatusPageSCIM.ts
+++ b/App/FeatureSet/Identity/API/StatusPageSCIM.ts
@@ -0,0 +1,996 @@
+import SCIMMiddleware from "Common/Server/Middleware/SCIMAuthorization";
+import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
+import StatusPageSCIMUserService from "Common/Server/Services/StatusPageSCIMUserService";
+import Express, {
+  ExpressRequest,
+  ExpressResponse,
+  ExpressRouter,
+  OneUptimeRequest,
+} from "Common/Server/Utils/Express";
+import Response from "Common/Server/Utils/Response";
+import logger from "Common/Server/Utils/Logger";
+import ObjectID from "Common/Types/ObjectID";
+import Email from "Common/Types/Email";
+import { JSONObject } from "Common/Types/JSON";
+import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
+import StatusPageSCIM from "Common/Models/DatabaseModels/StatusPageSCIM";
+import StatusPageSCIMUser from "Common/Models/DatabaseModels/StatusPageSCIMUser";
+import BadRequestException from "Common/Types/Exception/BadRequestException";
+import NotFoundException from "Common/Types/Exception/NotFoundException";
+import LIMIT_MAX from "Common/Types/Database/LimitMax";
+import {
+  parseNameFromSCIM,
+  formatUserForSCIM,
+  generateServiceProviderConfig,
+  generateUsersListResponse,
+  parseSCIMQueryParams,
+  logSCIMOperation,
+  extractEmailFromSCIM,
+  extractExternalIdFromSCIM,
+  isUserNameEmail,
+} from "../Utils/SCIMUtils";
+import Text from "Common/Types/Text";
+import HashedString from "Common/Types/HashedString";
+
+const router: ExpressRouter = Express.getRouter();
+
+// Helper function to find user by external ID or email
+const findUserByExternalIdOrEmail: (
+  userName: string,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+) => Promise<StatusPagePrivateUser | null> = async (
+  userName: string,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+): Promise<StatusPagePrivateUser | null> => {
+  // First check if userName is an external ID (not an email)
+  if (!isUserNameEmail(userName)) {
+    logSCIMOperation(
+      "User lookup",
+      "status-page",
+      scimConfigId.toString(),
+      `Looking for external ID: ${userName}`,
+    );
+    
+    // Look up by external ID
+    const scimUser: StatusPageSCIMUser | null = await StatusPageSCIMUserService.findOneBy({
+      query: {
+        externalId: userName,
+        statusPageId: statusPageId,
+        projectId: projectId,
+        scimConfigId: scimConfigId,
+      },
+      select: {
+        statusPagePrivateUserId: true,
+        statusPagePrivateUser: {
+          _id: true,
+          email: true,
+          createdAt: true,
+          updatedAt: true,
+        },
+      },
+      props: { isRoot: true },
+    });
+    
+    if (scimUser && scimUser.statusPagePrivateUser) {
+      logSCIMOperation(
+        "User lookup",
+        "status-page",
+        scimConfigId.toString(),
+        `Found user by external ID: ${scimUser.statusPagePrivateUser.id}`,
+      );
+      return scimUser.statusPagePrivateUser;
+    }
+  }
+  
+  // Fall back to email lookup
+  try {
+    logSCIMOperation(
+      "User lookup",
+      "status-page",
+      scimConfigId.toString(),
+      `Looking for email: ${userName}`,
+    );
+    
+    const user: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneBy({
+      query: { 
+        email: new Email(userName),
+        statusPageId: statusPageId,
+      },
+      select: {
+        _id: true,
+        email: true,
+        createdAt: true,
+        updatedAt: true,
+      },
+      props: { isRoot: true },
+    });
+    
+    if (user) {
+      logSCIMOperation(
+        "User lookup",
+        "status-page",
+        scimConfigId.toString(),
+        `Found user by email: ${user.id}`,
+      );
+    }
+    
+    return user;
+  } catch (error) {
+    // If email validation fails, userName is likely an external ID but no mapping exists
+    logSCIMOperation(
+      "User lookup",
+      "status-page",
+      scimConfigId.toString(),
+      `Email validation failed for: ${userName}, treating as external ID with no mapping`,
+    );
+    return null;
+  }
+};
+
+// Helper function to create or update SCIM user mapping
+const createOrUpdateSCIMUserMapping: (
+  user: StatusPagePrivateUser,
+  externalId: string,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+) => Promise<void> = async (
+  user: StatusPagePrivateUser,
+  externalId: string,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+): Promise<void> => {
+  // Check if mapping already exists
+  const existingMapping: StatusPageSCIMUser | null = await StatusPageSCIMUserService.findOneBy({
+    query: {
+      statusPagePrivateUserId: user.id!,
+      statusPageId: statusPageId,
+      projectId: projectId,
+      scimConfigId: scimConfigId,
+    },
+    select: { _id: true, externalId: true },
+    props: { isRoot: true },
+  });
+  
+  if (existingMapping) {
+    // Update existing mapping if external ID changed
+    if (existingMapping.externalId !== externalId) {
+      await StatusPageSCIMUserService.updateOneById({
+        id: existingMapping.id!,
+        data: { externalId: externalId },
+        props: { isRoot: true },
+      });
+      
+      logSCIMOperation(
+        "SCIM mapping",
+        "status-page",
+        scimConfigId.toString(),
+        `Updated external ID mapping for user ${user.id} from ${existingMapping.externalId} to ${externalId}`,
+      );
+    }
+  } else {
+    // Create new mapping
+    const scimUser: StatusPageSCIMUser = new StatusPageSCIMUser();
+    scimUser.statusPageId = statusPageId;
+    scimUser.projectId = projectId;
+    scimUser.scimConfigId = scimConfigId;
+    scimUser.statusPagePrivateUserId = user.id!;
+    scimUser.externalId = externalId;
+    
+    await StatusPageSCIMUserService.create({
+      data: scimUser,
+      props: { isRoot: true },
+    });
+    
+    logSCIMOperation(
+      "SCIM mapping",
+      "status-page",
+      scimConfigId.toString(),
+      `Created external ID mapping for user ${user.id} with external ID ${externalId}`,
+    );
+  }
+};
+
+// Helper function to resolve user ID (could be internal ID or external ID)
+const resolveUserId: (
+  userIdParam: string,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+) => Promise<ObjectID | null> = async (
+  userIdParam: string,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+): Promise<ObjectID | null> => {
+  // First try to parse as ObjectID (internal user ID)
+  try {
+    const objectId: ObjectID = new ObjectID(userIdParam);
+    
+    // Verify this user exists in the status page
+    const statusPageUser: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneBy({
+      query: {
+        _id: objectId,
+        statusPageId: statusPageId,
+      },
+      select: { _id: true },
+      props: { isRoot: true },
+    });
+    
+    if (statusPageUser) {
+      return objectId;
+    }
+  } catch (error) {
+    // Not a valid ObjectID, continue to external ID lookup
+  }
+  
+  // Try to find by external ID
+  const scimUser: StatusPageSCIMUser | null = await StatusPageSCIMUserService.findOneBy({
+    query: {
+      externalId: userIdParam,
+      statusPageId: statusPageId,
+      projectId: projectId,
+      scimConfigId: scimConfigId,
+    },
+    select: { statusPagePrivateUserId: true },
+    props: { isRoot: true },
+  });
+  
+  if (scimUser && scimUser.statusPagePrivateUserId) {
+    return scimUser.statusPagePrivateUserId;
+  }
+  
+  return null;
+};
+
+// Helper function to get external ID for a user
+const getExternalIdForUser: (
+  userId: ObjectID,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+) => Promise<string | null> = async (
+  userId: ObjectID,
+  statusPageId: ObjectID,
+  projectId: ObjectID,
+  scimConfigId: ObjectID,
+): Promise<string | null> => {
+  const scimUser: StatusPageSCIMUser | null = await StatusPageSCIMUserService.findOneBy({
+    query: {
+      statusPagePrivateUserId: userId,
+      statusPageId: statusPageId,
+      projectId: projectId,
+      scimConfigId: scimConfigId,
+    },
+    select: { externalId: true },
+    props: { isRoot: true },
+  });
+  
+  return scimUser?.externalId || null;
+};
+
+// SCIM Service Provider Configuration - GET /status-page-scim/v2/ServiceProviderConfig
+router.get(
+  "/status-page-scim/v2/:statusPageScimId/ServiceProviderConfig",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `🔗 STATUS PAGE SCIM API HIT: GET ServiceProviderConfig - statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+
+      logSCIMOperation(
+        "ServiceProviderConfig",
+        "status-page",
+        req.params["statusPageScimId"]!,
+      );
+
+      const serviceProviderConfig: JSONObject = generateServiceProviderConfig(
+        req,
+        req.params["statusPageScimId"]!,
+        "status-page",
+      );
+
+      return Response.sendJsonObjectResponse(req, res, serviceProviderConfig);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Status Page Users endpoint - GET /status-page-scim/v2/Users
+router.get(
+  "/status-page-scim/v2/:statusPageScimId/Users",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `🔗 STATUS PAGE SCIM API HIT: GET Users List - statusPageScimId: ${req.params["statusPageScimId"]}, query: ${JSON.stringify(req.query)}`,
+      );
+
+      logger.debug(
+        `Status Page SCIM Users list request for statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const scimConfig: StatusPageSCIM = bearerData["scimConfig"] as StatusPageSCIM;
+
+      // Parse query parameters
+      const { startIndex, count } = parseSCIMQueryParams(req);
+      const filter: string = req.query["filter"] as string;
+
+      logSCIMOperation(
+        "Users list",
+        "status-page",
+        req.params["statusPageScimId"]!,
+        `statusPageId: ${statusPageId}, startIndex: ${startIndex}, count: ${count}, filter: ${filter || "none"}`,
+      );
+
+      let users: Array<StatusPagePrivateUser> = [];
+
+      // Handle SCIM filter for userName
+      if (filter) {
+        const emailMatch: RegExpMatchArray | null = filter.match(
+          /userName eq "([^"]+)"/i,
+        );
+        if (emailMatch) {
+          const userName: string = emailMatch[1]!;
+          logSCIMOperation(
+            "Users list",
+            "status-page",
+            req.params["statusPageScimId"]!,
+            `filter by userName: ${userName}`,
+          );
+
+          if (userName) {
+            const user: StatusPagePrivateUser | null = await findUserByExternalIdOrEmail(
+              userName,
+              statusPageId,
+              projectId,
+              scimConfig.id!,
+            );
+            
+            if (user) {
+              users = [user];
+              logSCIMOperation(
+                "Users list",
+                "status-page",
+                req.params["statusPageScimId"]!,
+                `found user with id: ${user.id}`,
+              );
+            } else {
+              logSCIMOperation(
+                "Users list",
+                "status-page",
+                req.params["statusPageScimId"]!,
+                `user not found for userName: ${userName}`,
+              );
+              users = [];
+            }
+          }
+        }
+      } else {
+        // Get all private users for this status page
+        users = await StatusPagePrivateUserService.findBy({
+          query: {
+            statusPageId: statusPageId,
+          },
+          select: {
+            _id: true,
+            email: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+          skip: 0,
+          limit: LIMIT_MAX,
+          props: { isRoot: true },
+        });
+      }
+
+      logger.debug(
+        `Status Page SCIM Users - found ${users.length} users`,
+      );
+
+      // Format users for SCIM with external IDs
+      const formattedUsers: Array<JSONObject> = [];
+      
+      for (const user of users) {
+        // Get external ID for this user if it exists
+        const externalId: string | null = await getExternalIdForUser(
+          user.id!,
+          statusPageId,
+          projectId,
+          scimConfig.id!,
+        );
+        
+        const userFormatted: JSONObject = formatUserForSCIM(
+          user,
+          req,
+          req.params["statusPageScimId"]!,
+          "status-page",
+          externalId,
+        );
+        
+        formattedUsers.push(userFormatted);
+      }
+
+      // Paginate the results
+      const paginatedUsers: Array<JSONObject> = formattedUsers.slice(
+        (startIndex - 1) * count,
+        startIndex * count,
+      );
+
+      logger.debug(
+        `Status Page SCIM Users response prepared with ${formattedUsers.length} users`,
+      );
+
+      return Response.sendJsonObjectResponse(
+        req,
+        res,
+        generateUsersListResponse(paginatedUsers, startIndex, formattedUsers.length),
+      );
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Get Individual Status Page User - GET /status-page-scim/v2/Users/{id}
+router.get(
+  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `🔗 STATUS PAGE SCIM API HIT: GET Individual User - statusPageScimId: ${req.params["statusPageScimId"]}, userId: ${req.params["userId"]}`,
+      );
+
+      logger.debug(
+        `Status Page SCIM Get individual user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const scimConfig: StatusPageSCIM = bearerData["scimConfig"] as StatusPageSCIM;
+      const userIdParam: string = req.params["userId"]!;
+
+      logger.debug(
+        `Status Page SCIM Get user - statusPageId: ${statusPageId}, userIdParam: ${userIdParam}`,
+      );
+
+      if (!userIdParam) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Resolve user ID (could be internal ID or external ID)
+      const userId: ObjectID | null = await resolveUserId(
+        userIdParam,
+        statusPageId,
+        projectId,
+        scimConfig.id!,
+      );
+
+      if (!userId) {
+        logger.debug(
+          `Status Page SCIM Get user - could not resolve user ID for param: ${userIdParam}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this status page",
+        );
+      }
+
+      // Check if user exists and belongs to this status page
+      const statusPageUser: StatusPagePrivateUser | null =
+        await StatusPagePrivateUserService.findOneBy({
+          query: {
+            statusPageId: statusPageId,
+            _id: userId,
+          },
+          select: {
+            _id: true,
+            email: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+          props: { isRoot: true },
+        });
+
+      if (!statusPageUser) {
+        logger.debug(
+          `Status Page SCIM Get user - user not found for resolved userId: ${userId}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this status page",
+        );
+      }
+
+      // Get external ID for this user if it exists
+      const externalId: string | null = await getExternalIdForUser(
+        statusPageUser.id!,
+        statusPageId,
+        projectId,
+        scimConfig.id!,
+      );
+
+      const user: JSONObject = formatUserForSCIM(
+        statusPageUser,
+        req,
+        req.params["statusPageScimId"]!,
+        "status-page",
+        externalId,
+      );
+
+      logger.debug(
+        `Status Page SCIM Get user - returning user with id: ${statusPageUser.id}`,
+      );
+
+      return Response.sendJsonObjectResponse(req, res, user);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Create Status Page User - POST /status-page-scim/v2/Users
+router.post(
+  "/status-page-scim/v2/:statusPageScimId/Users",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `🔗 STATUS PAGE SCIM API HIT: POST Create User - statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+
+      logger.debug(
+        `Status Page SCIM Create user request for statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const scimConfig: StatusPageSCIM = bearerData[
+        "scimConfig"
+      ] as StatusPageSCIM;
+
+      if (!scimConfig.autoProvisionUsers) {
+        throw new BadRequestException(
+          "Auto-provisioning is disabled for this status page",
+        );
+      }
+
+      const scimUser: JSONObject = req.body;
+      const userName: string = extractEmailFromSCIM(scimUser);
+      const externalId: string | null = extractExternalIdFromSCIM(scimUser);
+      const name: string = parseNameFromSCIM(scimUser);
+
+      logger.debug(
+        `Status Page SCIM Create user - statusPageId: ${statusPageId}`,
+      );
+
+      logger.debug(
+        `Request body for Status Page SCIM Create user: ${JSON.stringify(scimUser, null, 2)}`,
+      );
+
+      logger.debug(`Status Page SCIM Create user - userName: ${userName}, externalId: ${externalId}, name: ${name}`);
+
+      // Extract email from emails array if userName is not an email
+      let email: string = "";
+      if (isUserNameEmail(userName)) {
+        email = userName;
+      } else {
+        // Look for email in the emails array
+        const emailsArray: JSONObject[] = scimUser["emails"] as JSONObject[];
+        if (emailsArray && emailsArray.length > 0) {
+          email = emailsArray[0]?.["value"] as string;
+        }
+      }
+
+      if (!email && !externalId) {
+        throw new BadRequestException(
+          "Either a valid email address or external ID is required",
+        );
+      }
+
+      // Check if user already exists (by external ID first, then email)
+      let user: StatusPagePrivateUser | null = null;
+      
+      if (externalId) {
+        user = await findUserByExternalIdOrEmail(
+          externalId,
+          statusPageId,
+          projectId,
+          scimConfig.id!,
+        );
+      }
+      
+      if (!user && email) {
+        try {
+          user = await StatusPagePrivateUserService.findOneBy({
+            query: { 
+              email: new Email(email),
+              statusPageId: statusPageId,
+            },
+            select: {
+              _id: true,
+              email: true,
+              createdAt: true,
+              updatedAt: true,
+            },
+            props: { isRoot: true },
+          });
+        } catch (error) {
+          // Email validation failed, continue without email lookup
+          logger.debug(`Status Page SCIM Create user - email validation failed for: ${email}`);
+        }
+      }
+
+      // Create user if doesn't exist
+      if (!user) {
+        if (!email) {
+          throw new BadRequestException(
+            "A valid email address is required to create a new user",
+          );
+        }
+        
+        logger.debug(
+          `Status Page SCIM Create user - creating new user with email: ${email}`,
+        );
+
+        const privateUser: StatusPagePrivateUser = new StatusPagePrivateUser();
+        privateUser.statusPageId = statusPageId;
+        privateUser.email = new Email(email);
+        privateUser.password = new HashedString(Text.generateRandomText(32));
+        privateUser.projectId = projectId;
+
+        // Create new status page private user
+        user = await StatusPagePrivateUserService.create({
+          data: privateUser as any,
+          props: { isRoot: true },
+        });
+      } else {
+        logger.debug(
+          `Status Page SCIM Create user - user already exists with id: ${user.id}`,
+        );
+      }
+
+      // Create or update SCIM user mapping if we have an external ID
+      if (externalId && user.id) {
+        await createOrUpdateSCIMUserMapping(
+          user,
+          externalId,
+          statusPageId,
+          projectId,
+          scimConfig.id!,
+        );
+      }
+
+      const createdUser: JSONObject = formatUserForSCIM(
+        user,
+        req,
+        req.params["statusPageScimId"]!,
+        "status-page",
+        externalId,
+      );
+
+      logger.debug(
+        `Status Page SCIM Create user - returning created user with id: ${user.id}`,
+      );
+
+      res.status(201);
+      return Response.sendJsonObjectResponse(req, res, createdUser);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Update Status Page User - PUT /status-page-scim/v2/Users/{id}
+router.put(
+  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `🔗 STATUS PAGE SCIM API HIT: PUT Update User - statusPageScimId: ${req.params["statusPageScimId"]}, userId: ${req.params["userId"]}`,
+      );
+
+      logger.debug(
+        `Status Page SCIM Update user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const scimConfig: StatusPageSCIM = bearerData["scimConfig"] as StatusPageSCIM;
+      const userIdParam: string = req.params["userId"]!;
+      const scimUser: JSONObject = req.body;
+
+      logger.debug(
+        `Status Page SCIM Update user - statusPageId: ${statusPageId}, userIdParam: ${userIdParam}`,
+      );
+
+      logger.debug(
+        `Request body for Status Page SCIM Update user: ${JSON.stringify(scimUser, null, 2)}`,
+      );
+
+      if (!userIdParam) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Resolve user ID (could be internal ID or external ID)
+      const userId: ObjectID | null = await resolveUserId(
+        userIdParam,
+        statusPageId,
+        projectId,
+        scimConfig.id!,
+      );
+
+      if (!userId) {
+        logger.debug(
+          `Status Page SCIM Update user - could not resolve user ID for param: ${userIdParam}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this status page",
+        );
+      }
+
+      // Check if user exists and belongs to this status page
+      const statusPageUser: StatusPagePrivateUser | null =
+        await StatusPagePrivateUserService.findOneBy({
+          query: {
+            statusPageId: statusPageId,
+            _id: userId,
+          },
+          select: {
+            _id: true,
+            email: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+          props: { isRoot: true },
+        });
+
+      if (!statusPageUser) {
+        logger.debug(
+          `Status Page SCIM Update user - user not found for resolved userId: ${userId}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this status page",
+        );
+      }
+
+      // Update user information
+      const userName: string = extractEmailFromSCIM(scimUser);
+      const externalId: string | null = extractExternalIdFromSCIM(scimUser);
+      const active: boolean = scimUser["active"] as boolean;
+
+      logger.debug(
+        `Status Page SCIM Update user - userName: ${userName}, externalId: ${externalId}, active: ${active}`,
+      );
+
+      // Extract email from emails array if userName is not an email
+      let email: string = "";
+      if (isUserNameEmail(userName)) {
+        email = userName;
+      } else {
+        // Look for email in the emails array
+        const emailsArray: JSONObject[] = scimUser["emails"] as JSONObject[];
+        if (emailsArray && emailsArray.length > 0) {
+          email = emailsArray[0]?.["value"] as string;
+        }
+      }
+
+      // Create or update SCIM user mapping if we have an external ID
+      if (externalId) {
+        await createOrUpdateSCIMUserMapping(
+          statusPageUser,
+          externalId,
+          statusPageId,
+          projectId,
+          scimConfig.id!,
+        );
+      }
+
+      // Handle user deactivation by deleting from status page
+      if (active === false) {
+        logger.debug(
+          `Status Page SCIM Update user - user marked as inactive, removing from status page`,
+        );
+
+        if (scimConfig.autoDeprovisionUsers) {
+          await StatusPagePrivateUserService.deleteOneById({
+            id: userId,
+            props: { isRoot: true },
+          });
+
+          logger.debug(
+            `Status Page SCIM Update user - user removed from status page`,
+          );
+
+          // Return empty response for deleted user
+          res.status(204);
+          return Response.sendJsonObjectResponse(req, res, {
+            message: "User deprovisioned",
+          });
+        }
+      }
+
+      // Update email if provided and changed
+      if (email && email !== statusPageUser.email?.toString()) {
+        logger.debug(
+          `Status Page SCIM Update user - updating email from ${statusPageUser.email?.toString()} to ${email}`,
+        );
+
+        await StatusPagePrivateUserService.updateOneById({
+          id: userId,
+          data: { email: new Email(email) },
+          props: { isRoot: true },
+        });
+
+        // Fetch updated user
+        const updatedUser: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneById({
+          id: userId,
+          select: {
+            _id: true,
+            email: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+          props: { isRoot: true },
+        });
+
+        if (updatedUser) {
+          const userExternalId: string | null = await getExternalIdForUser(
+            updatedUser.id!,
+            statusPageId,
+            projectId,
+            scimConfig.id!,
+          );
+          
+          const user: JSONObject = formatUserForSCIM(
+            updatedUser,
+            req,
+            req.params["statusPageScimId"]!,
+            "status-page",
+            userExternalId,
+          );
+          return Response.sendJsonObjectResponse(req, res, user);
+        }
+      }
+
+      logger.debug(
+        `Status Page SCIM Update user - no updates made, returning existing user`,
+      );
+
+      // If no updates were made, return the existing user
+      const userExternalId: string | null = await getExternalIdForUser(
+        statusPageUser.id!,
+        statusPageId,
+        projectId,
+        scimConfig.id!,
+      );
+      
+      const user: JSONObject = formatUserForSCIM(
+        statusPageUser,
+        req,
+        req.params["statusPageScimId"]!,
+        "status-page",
+        userExternalId,
+      );
+
+      return Response.sendJsonObjectResponse(req, res, user);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Delete Status Page User - DELETE /status-page-scim/v2/Users/{id}
+router.delete(
+  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `🔗 STATUS PAGE SCIM API HIT: DELETE User - statusPageScimId: ${req.params["statusPageScimId"]}, userId: ${req.params["userId"]}`,
+      );
+
+      logger.debug(
+        `Status Page SCIM Delete user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const scimConfig: StatusPageSCIM = bearerData["scimConfig"] as StatusPageSCIM;
+      const userIdParam: string = req.params["userId"]!;
+
+      if (!scimConfig.autoDeprovisionUsers) {
+        throw new BadRequestException(
+          "Auto-deprovisioning is disabled for this status page",
+        );
+      }
+
+      logger.debug(
+        `Status Page SCIM Delete user - statusPageId: ${statusPageId}, userIdParam: ${userIdParam}`,
+      );
+
+      if (!userIdParam) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Resolve user ID (could be internal ID or external ID)
+      const userId: ObjectID | null = await resolveUserId(
+        userIdParam,
+        statusPageId,
+        projectId,
+        scimConfig.id!,
+      );
+
+      if (!userId) {
+        logger.debug(
+          `Status Page SCIM Delete user - could not resolve user ID for param: ${userIdParam}`,
+        );
+        throw new NotFoundException("User not found");
+      }
+
+      // Check if user exists and belongs to this status page
+      const statusPageUser: StatusPagePrivateUser | null =
+        await StatusPagePrivateUserService.findOneBy({
+          query: {
+            statusPageId: statusPageId,
+            _id: userId,
+          },
+          select: {
+            _id: true,
+          },
+          props: { isRoot: true },
+        });
+
+      if (!statusPageUser) {
+        logger.debug(
+          `Status Page SCIM Delete user - user not found for resolved userId: ${userId}`,
+        );
+        // SCIM spec says to return 404 for non-existent resources
+        throw new NotFoundException("User not found");
+      }
+
+      // Delete the user from status page
+      await StatusPagePrivateUserService.deleteOneById({
+        id: userId,
+        props: { isRoot: true },
+      });
+
+      logger.debug(
+        `Status Page SCIM Delete user - user deleted successfully for userId: ${userId}`,
+      );
+
+      // Return 204 No Content for successful deletion
+      res.status(204);
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+export default router;
--- a/App/FeatureSet/Identity/Index.ts
+++ b/App/FeatureSet/Identity/Index.ts
@@ -1,8 +1,10 @@
 import AuthenticationAPI from "./API/Authentication";
 import ResellerAPI from "./API/Reseller";
 import SsoAPI from "./API/SSO";
+import SCIMAPI from "./API/SCIM";
 import StatusPageAuthenticationAPI from "./API/StatusPageAuthentication";
 import StatusPageSsoAPI from "./API/StatusPageSSO";
+import StatusPageSCIMAPI from "./API/StatusPageSCIM";
 import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import "ejs";
@@ -19,6 +21,10 @@ const IdentityFeatureSet: FeatureSet = {

    app.use([`/${APP_NAME}`, "/"], SsoAPI);

+    app.use([`/${APP_NAME}`, "/"], SCIMAPI);
+
+    app.use([`/${APP_NAME}`, "/"], StatusPageSCIMAPI);
+
    app.use([`/${APP_NAME}`, "/"], StatusPageSsoAPI);

    app.use(
--- a/App/FeatureSet/Identity/Utils/SCIMUtils.ts
+++ b/App/FeatureSet/Identity/Utils/SCIMUtils.ts
@@ -0,0 +1,301 @@
+import { ExpressRequest } from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import { JSONObject } from "Common/Types/JSON";
+import Email from "Common/Types/Email";
+import Name from "Common/Types/Name";
+import ObjectID from "Common/Types/ObjectID";
+
+/**
+ * Shared SCIM utility functions for both Project SCIM and Status Page SCIM
+ */
+
+// Base interface for SCIM user-like objects - compatible with User model
+export interface SCIMUser {
+  id?: ObjectID | null;
+  email?: Email;
+  name?: Name | string;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+
+/**
+ * Parse name information from SCIM user payload
+ */
+export const parseNameFromSCIM: (scimUser: JSONObject) => string = (
+  scimUser: JSONObject,
+): string => {
+  logger.debug(
+    `SCIM - Parsing name from SCIM user: ${JSON.stringify(scimUser, null, 2)}`,
+  );
+
+  const givenName: string =
+    ((scimUser["name"] as JSONObject)?.["givenName"] as string) || "";
+  const familyName: string =
+    ((scimUser["name"] as JSONObject)?.["familyName"] as string) || "";
+  const formattedName: string = (scimUser["name"] as JSONObject)?.[
+    "formatted"
+  ] as string;
+
+  // Construct full name: prefer formatted, then combine given+family, then fallback to displayName
+  if (formattedName) {
+    return formattedName;
+  } else if (givenName || familyName) {
+    return `${givenName} ${familyName}`.trim();
+  } else if (scimUser["displayName"]) {
+    return scimUser["displayName"] as string;
+  }
+  return "";
+};
+
+/**
+ * Parse full name into SCIM name format
+ */
+export const parseNameToSCIMFormat: (fullName: string) => {
+  givenName: string;
+  familyName: string;
+  formatted: string;
+} = (
+  fullName: string,
+): { givenName: string; familyName: string; formatted: string } => {
+  const nameParts: string[] = fullName.trim().split(/\s+/);
+  const givenName: string = nameParts[0] || "";
+  const familyName: string = nameParts.slice(1).join(" ") || "";
+
+  return {
+    givenName,
+    familyName,
+    formatted: fullName,
+  };
+};
+
+/**
+ * Format user object for SCIM response
+ */
+export const formatUserForSCIM: (
+  user: SCIMUser,
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+  externalId?: string | null,
+) => JSONObject = (
+  user: SCIMUser,
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+  externalId?: string | null,
+): JSONObject => {
+  const baseUrl: string = `${req.protocol}://${req.get("host")}`;
+  const userName: string = externalId || user.email?.toString() || "";
+  const email: string = user.email?.toString() || "";
+  const fullName: string =
+    user.name?.toString() || email.split("@")[0] || "Unknown User";
+
+  const nameData: { givenName: string; familyName: string; formatted: string } =
+    parseNameToSCIMFormat(fullName);
+
+  // Determine the correct endpoint path based on SCIM type
+  const endpointPath: string =
+    scimType === "project"
+      ? `/scim/v2/${scimId}/Users/${user.id?.toString()}`
+      : `/status-page-scim/v2/${scimId}/Users/${user.id?.toString()}`;
+
+  return {
+    schemas: ["urn:ietf:params:scim:schemas:core:2.0:User"],
+    id: user.id?.toString(),
+    userName: userName,
+    displayName: nameData.formatted,
+    name: {
+      formatted: nameData.formatted,
+      familyName: nameData.familyName,
+      givenName: nameData.givenName,
+    },
+    emails: [
+      {
+        value: email,
+        type: "work",
+        primary: true,
+      },
+    ],
+    active: true,
+    meta: {
+      resourceType: "User",
+      created: user.createdAt?.toISOString(),
+      lastModified: user.updatedAt?.toISOString(),
+      location: `${baseUrl}${endpointPath}`,
+    },
+  };
+};
+
+/**
+ * Extract email from SCIM user payload
+ */
+export const extractEmailFromSCIM: (scimUser: JSONObject) => string = (
+  scimUser: JSONObject,
+): string => {
+  return (
+    (scimUser["userName"] as string) ||
+    ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string) ||
+    ""
+  );
+};
+
+/**
+ * Extract external ID from SCIM user payload (for non-email userNames)
+ */
+export const extractExternalIdFromSCIM: (scimUser: JSONObject) => string | null = (
+  scimUser: JSONObject,
+): string | null => {
+  const userName: string = scimUser["userName"] as string;
+  if (!userName) {
+    return null;
+  }
+  
+  // Check if userName is not an email - if it's not a valid email format, treat it as external ID
+  const emailRegex: RegExp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  if (!emailRegex.test(userName)) {
+    return userName;
+  }
+  
+  return null;
+};
+
+/**
+ * Check if a userName field contains an email or external ID
+ */
+export const isUserNameEmail: (userName: string) => boolean = (
+  userName: string,
+): boolean => {
+  if (!userName) {
+    return false;
+  }
+  
+  const emailRegex: RegExp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailRegex.test(userName);
+};
+
+/**
+ * Extract active status from SCIM user payload
+ */
+export const extractActiveFromSCIM: (scimUser: JSONObject) => boolean = (
+  scimUser: JSONObject,
+): boolean => {
+  return scimUser["active"] !== false; // Default to true if not specified
+};
+
+/**
+ * Generate SCIM ServiceProviderConfig response
+ */
+export const generateServiceProviderConfig: (
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+  documentationUrl?: string,
+) => JSONObject = (
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+  documentationUrl: string = "https://oneuptime.com/docs/identity/scim",
+): JSONObject => {
+  const baseUrl: string = `${req.protocol}://${req.get("host")}`;
+  const endpointPath: string =
+    scimType === "project"
+      ? `/scim/v2/${scimId}`
+      : `/status-page-scim/v2/${scimId}`;
+
+  return {
+    schemas: ["urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig"],
+    documentationUri: documentationUrl,
+    patch: {
+      supported: true,
+    },
+    bulk: {
+      supported: true,
+      maxOperations: 1000,
+      maxPayloadSize: 1048576,
+    },
+    filter: {
+      supported: true,
+      maxResults: 200,
+    },
+    changePassword: {
+      supported: false,
+    },
+    sort: {
+      supported: true,
+    },
+    etag: {
+      supported: false,
+    },
+    authenticationSchemes: [
+      {
+        type: "httpbearer",
+        name: "HTTP Bearer",
+        description: "Authentication scheme using HTTP Bearer Token",
+        primary: true,
+      },
+    ],
+    meta: {
+      location: `${baseUrl}${endpointPath}/ServiceProviderConfig`,
+      resourceType: "ServiceProviderConfig",
+      created: "2023-01-01T00:00:00Z",
+      lastModified: "2023-01-01T00:00:00Z",
+    },
+  };
+};
+
+/**
+ * Generate SCIM ListResponse for users
+ */
+export const generateUsersListResponse: (
+  users: JSONObject[],
+  startIndex: number,
+  totalResults: number,
+) => JSONObject = (
+  users: JSONObject[],
+  startIndex: number,
+  totalResults: number,
+): JSONObject => {
+  return {
+    schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
+    totalResults: totalResults,
+    startIndex: startIndex,
+    itemsPerPage: users.length,
+    Resources: users,
+  };
+};
+
+/**
+ * Parse query parameters for SCIM list requests
+ */
+export const parseSCIMQueryParams: (req: ExpressRequest) => {
+  startIndex: number;
+  count: number;
+} = (req: ExpressRequest): { startIndex: number; count: number } => {
+  const startIndex: number = parseInt(req.query["startIndex"] as string) || 1;
+  const count: number = Math.min(
+    parseInt(req.query["count"] as string) || 100,
+    200, // SCIM recommended max
+  );
+
+  return { startIndex, count };
+};
+
+/**
+ * Log SCIM operation with consistent format
+ */
+export const logSCIMOperation: (
+  operation: string,
+  scimType: "project" | "status-page",
+  scimId: string,
+  details?: string,
+) => void = (
+  operation: string,
+  scimType: "project" | "status-page",
+  scimId: string,
+  details?: string,
+): void => {
+  const logPrefix: string =
+    scimType === "project" ? "Project SCIM" : "Status Page SCIM";
+  const message: string = `${logPrefix} ${operation} - scimId: ${scimId}${details ? `, ${details}` : ""}`;
+  logger.debug(message);
+};
--- a/App/FeatureSet/Identity/Views/Partials/Head.ejs
+++ b/App/FeatureSet/Identity/Views/Partials/Head.ejs
@@ -67,7 +67,6 @@
 <link rel="apple-touch-icon-precomposed" href="/img/ou-wb.svg">
 <link rel="icon" href="/img/ou-wb.svg">
 <link rel="image_src" type="image/png" href="/img/hou-wb.svg">
-<link rel="canonical" href="/">
 <link rel="manifest" href="/manifest.json">
 <meta property="og:title" content="OneUptime - One Complete Observability platform.">
 <meta property="og:url" content="https://oneuptime.com">
--- a/App/FeatureSet/Notification/API/Call.ts
+++ b/App/FeatureSet/Notification/API/Call.ts
@@ -31,6 +31,22 @@ router.post(
      userOnCallLogTimelineId:
        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
      customTwilioConfig: body["customTwilioConfig"] as any,
+      incidentId: (body["incidentId"] as ObjectID) || undefined,
+      alertId: (body["alertId"] as ObjectID) || undefined,
+      scheduledMaintenanceId:
+        (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+      statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+      statusPageAnnouncementId:
+        (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+      userId: (body["userId"] as ObjectID) || undefined,
+      onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+      onCallPolicyEscalationRuleId:
+        (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+      onCallDutyPolicyExecutionLogTimelineId:
+        (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+        undefined,
+      onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+      teamId: (body["teamId"] as ObjectID) || undefined,
    });

    return Response.sendEmptySuccessResponse(req, res);
--- a/App/FeatureSet/Notification/API/Mail.ts
+++ b/App/FeatureSet/Notification/API/Mail.ts
@@ -43,6 +43,43 @@ router.post(
      emailServer: mailServer,
      userOnCallLogTimelineId:
        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+      incidentId: body["incidentId"]
+        ? new ObjectID(body["incidentId"].toString())
+        : undefined,
+      alertId: body["alertId"]
+        ? new ObjectID(body["alertId"].toString())
+        : undefined,
+      scheduledMaintenanceId: body["scheduledMaintenanceId"]
+        ? new ObjectID(body["scheduledMaintenanceId"].toString())
+        : undefined,
+      statusPageId: body["statusPageId"]
+        ? new ObjectID(body["statusPageId"].toString())
+        : undefined,
+      statusPageAnnouncementId: body["statusPageAnnouncementId"]
+        ? new ObjectID(body["statusPageAnnouncementId"].toString())
+        : undefined,
+      userId: body["userId"]
+        ? new ObjectID(body["userId"].toString())
+        : undefined,
+      onCallPolicyId: body["onCallPolicyId"]
+        ? new ObjectID(body["onCallPolicyId"].toString())
+        : undefined,
+      onCallPolicyEscalationRuleId: body["onCallPolicyEscalationRuleId"]
+        ? new ObjectID(body["onCallPolicyEscalationRuleId"].toString())
+        : undefined,
+      onCallDutyPolicyExecutionLogTimelineId: body[
+        "onCallDutyPolicyExecutionLogTimelineId"
+      ]
+        ? new ObjectID(
+            body["onCallDutyPolicyExecutionLogTimelineId"].toString(),
+          )
+        : undefined,
+      onCallScheduleId: body["onCallScheduleId"]
+        ? new ObjectID(body["onCallScheduleId"].toString())
+        : undefined,
+      teamId: body["teamId"]
+        ? new ObjectID(body["teamId"].toString())
+        : undefined,
    });

    return Response.sendEmptySuccessResponse(req, res);
--- a/App/FeatureSet/Notification/API/PushNotification.ts
+++ b/App/FeatureSet/Notification/API/PushNotification.ts
@@ -0,0 +1,65 @@
+import PushService from "../Services/PushNotificationService";
+import ClusterKeyAuthorization from "Common/Server/Middleware/ClusterKeyAuthorization";
+import ObjectID from "Common/Types/ObjectID";
+import Express, {
+  ExpressRequest,
+  ExpressResponse,
+  ExpressRouter,
+} from "Common/Server/Utils/Express";
+import Response from "Common/Server/Utils/Response";
+import { JSONObject } from "Common/Types/JSON";
+import JSONFunctions from "Common/Types/JSONFunctions";
+
+const router: ExpressRouter = Express.getRouter();
+
+router.post(
+  "/send",
+  ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
+  async (req: ExpressRequest, res: ExpressResponse) => {
+    const body: JSONObject = JSONFunctions.deserialize(req.body);
+
+    // Support both new devices format and legacy deviceTokens/deviceNames format
+    let devices: Array<{ token: string; name?: string }> = [];
+
+    if (body["devices"]) {
+      // New format: devices as array of objects
+      devices = body["devices"] as Array<{ token: string; name?: string }>;
+    } else {
+      throw new Error("Invalid request format: 'devices' array is required.");
+    }
+
+    await PushService.send(
+      {
+        devices,
+        deviceType: (body["deviceType"] as any) || "web",
+        message: body["message"] as any,
+      },
+      {
+        projectId: (body["projectId"] as ObjectID) || undefined,
+        isSensitive: (body["isSensitive"] as boolean) || false,
+        userOnCallLogTimelineId:
+          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+        incidentId: (body["incidentId"] as ObjectID) || undefined,
+        alertId: (body["alertId"] as ObjectID) || undefined,
+        scheduledMaintenanceId:
+          (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+        statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+        statusPageAnnouncementId:
+          (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+        userId: (body["userId"] as ObjectID) || undefined,
+        onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+        onCallPolicyEscalationRuleId:
+          (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+        onCallDutyPolicyExecutionLogTimelineId:
+          (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+          undefined,
+        onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+        teamId: (body["teamId"] as ObjectID) || undefined,
+      },
+    );
+
+    return Response.sendEmptySuccessResponse(req, res);
+  },
+);
+
+export default router;
--- a/App/FeatureSet/Notification/API/SMS.ts
+++ b/App/FeatureSet/Notification/API/SMS.ts
@@ -30,6 +30,22 @@ router.post(
      userOnCallLogTimelineId:
        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
      customTwilioConfig: body["customTwilioConfig"] as any,
+      incidentId: (body["incidentId"] as ObjectID) || undefined,
+      alertId: (body["alertId"] as ObjectID) || undefined,
+      scheduledMaintenanceId:
+        (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+      statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+      statusPageAnnouncementId:
+        (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+      userId: (body["userId"] as ObjectID) || undefined,
+      onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+      onCallPolicyEscalationRuleId:
+        (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+      onCallDutyPolicyExecutionLogTimelineId:
+        (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+        undefined,
+      onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+      teamId: (body["teamId"] as ObjectID) || undefined,
    });

    return Response.sendEmptySuccessResponse(req, res);
--- a/App/FeatureSet/Notification/Config.ts
+++ b/App/FeatureSet/Notification/Config.ts
@@ -1,10 +1,8 @@
-import Hostname from "Common/Types/API/Hostname";
 import TwilioConfig from "Common/Types/CallAndSMS/TwilioConfig";
 import Email from "Common/Types/Email";
 import EmailServer from "Common/Types/Email/EmailServer";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import ObjectID from "Common/Types/ObjectID";
-import Port from "Common/Types/Port";
 import { AdminDashboardClientURL } from "Common/Server/EnvironmentConfig";
 import GlobalConfigService from "Common/Server/Services/GlobalConfigService";
 import GlobalConfig, {
@@ -12,24 +10,6 @@ import GlobalConfig, {
 } from "Common/Models/DatabaseModels/GlobalConfig";
 import Phone from "Common/Types/Phone";

-export const InternalSmtpPassword: string =
-  process.env["INTERNAL_SMTP_PASSWORD"] || "";
-
-export const InternalSmtpHost: Hostname = new Hostname(
-  process.env["INTERNAL_SMTP_HOST"] || "haraka",
-);
-
-export const InternalSmtpPort: Port = new Port(2525);
-
-export const InternalSmtpSecure: boolean = false;
-
-export const InternalSmtpEmail: Email = new Email(
-  process.env["INTERNAL_SMTP_EMAIL"] || "noreply@oneuptime.com",
-);
-
-export const InternalSmtpFromName: string =
-  process.env["INTERNAL_SMTP_FROM_NAME"] || "OneUptime";
-
 type GetGlobalSMTPConfig = () => Promise<EmailServer | null>;

 export const getGlobalSMTPConfig: GetGlobalSMTPConfig =
@@ -132,10 +112,10 @@ export const getEmailServerType: GetEmailServerTypeFunction =
      });

    if (!globalConfig) {
-      return EmailServerType.Internal;
+      return EmailServerType.CustomSMTP;
    }

-    return globalConfig.emailServerType || EmailServerType.Internal;
+    return globalConfig.emailServerType || EmailServerType.CustomSMTP;
  };

 export interface SendGridConfig {
--- a/App/FeatureSet/Notification/Index.ts
+++ b/App/FeatureSet/Notification/Index.ts
@@ -2,6 +2,7 @@ import CallAPI from "./API/Call";
 // API
 import MailAPI from "./API/Mail";
 import SmsAPI from "./API/SMS";
+import PushNotificationAPI from "./API/PushNotification";
 import SMTPConfigAPI from "./API/SMTPConfig";
 import "./Utils/Handlebars";
 import FeatureSet from "Common/Server/Types/FeatureSet";
@@ -15,6 +16,7 @@ const NotificationFeatureSet: FeatureSet = {

    app.use([`/${APP_NAME}/email`, "/email"], MailAPI);
    app.use([`/${APP_NAME}/sms`, "/sms"], SmsAPI);
+    app.use([`/${APP_NAME}/push`, "/push"], PushNotificationAPI);
    app.use([`/${APP_NAME}/call`, "/call"], CallAPI);
    app.use([`/${APP_NAME}/smtp-config`, "/smtp-config"], SMTPConfigAPI);
  },
--- a/App/FeatureSet/Notification/Services/CallService.ts
+++ b/App/FeatureSet/Notification/Services/CallService.ts
@@ -28,6 +28,36 @@ import Twilio from "twilio";
 import { CallInstance } from "twilio/lib/rest/api/v2010/account/call";
 import Phone from "Common/Types/Phone";

+/**
+ * Extracts the main sayMessage values from a CallRequest's data array for call summary.
+ * Excludes acknowledgment responses, error messages, and other system messages.
+ * @param callRequest The call request containing data array with various objects
+ * @returns A string containing main call content messages separated by newlines
+ */
+function extractSayMessagesFromCallRequest(callRequest: CallRequest): string {
+  const sayMessages: string[] = [];
+
+  if (callRequest.data && Array.isArray(callRequest.data)) {
+    for (const item of callRequest.data) {
+      // Check if the item is a Say object with sayMessage
+      if ((item as Say).sayMessage) {
+        sayMessages.push((item as Say).sayMessage);
+      }
+      // Check if the item is a GatherInput with introMessage
+      if ((item as GatherInput).introMessage) {
+        sayMessages.push((item as GatherInput).introMessage);
+      }
+      // NOTE: Excluding noInputMessage and onInputCallRequest messages from summary
+      // as they contain system responses like "Good bye", "Invalid input", "You have acknowledged"
+      // which should not be included in the call summary according to user requirements
+    }
+  }
+
+  return sayMessages.length > 0
+    ? sayMessages.join(" ")
+    : "No message content found";
+}
+
 export default class CallService {
  public static async makeCall(
    callRequest: CallRequest,
@@ -36,6 +66,18 @@ export default class CallService {
      isSensitive?: boolean; // if true, message will not be logged
      userOnCallLogTimelineId?: ObjectID | undefined; // user notification log timeline id
      customTwilioConfig?: TwilioConfig | undefined;
+      incidentId?: ObjectID | undefined;
+      alertId?: ObjectID | undefined;
+      scheduledMaintenanceId?: ObjectID | undefined;
+      statusPageId?: ObjectID | undefined;
+      statusPageAnnouncementId?: ObjectID | undefined;
+      userId?: ObjectID | undefined;
+      // On-call policy related fields
+      onCallPolicyId?: ObjectID | undefined;
+      onCallPolicyEscalationRuleId?: ObjectID | undefined;
+      onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+      onCallScheduleId?: ObjectID | undefined;
+      teamId?: ObjectID | undefined;
    },
  ): Promise<void> {
    let callError: Error | null = null;
@@ -82,14 +124,58 @@ export default class CallService {
      callLog.fromNumber = fromNumber;
      callLog.callData =
        options && options.isSensitive
-          ? { message: "This call is sensitive and is not logged" }
-          : JSON.parse(JSON.stringify(callRequest));
+          ? ({ message: "This call is sensitive and is not logged" } as any)
+          : ({
+              message: extractSayMessagesFromCallRequest(callRequest),
+            } as any);
      callLog.callCostInUSDCents = 0;

      if (options.projectId) {
        callLog.projectId = options.projectId;
      }

+      if (options.incidentId) {
+        callLog.incidentId = options.incidentId;
+      }
+
+      if (options.alertId) {
+        callLog.alertId = options.alertId;
+      }
+
+      if (options.scheduledMaintenanceId) {
+        callLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
+      }
+
+      if (options.statusPageId) {
+        callLog.statusPageId = options.statusPageId;
+      }
+
+      if (options.statusPageAnnouncementId) {
+        callLog.statusPageAnnouncementId = options.statusPageAnnouncementId;
+      }
+
+      if (options.userId) {
+        callLog.userId = options.userId;
+      }
+
+      if (options.teamId) {
+        callLog.teamId = options.teamId;
+      }
+
+      // Set OnCall-related fields
+      if (options.onCallPolicyId) {
+        callLog.onCallDutyPolicyId = options.onCallPolicyId;
+      }
+
+      if (options.onCallPolicyEscalationRuleId) {
+        callLog.onCallDutyPolicyEscalationRuleId =
+          options.onCallPolicyEscalationRuleId;
+      }
+
+      if (options.onCallScheduleId) {
+        callLog.onCallDutyPolicyScheduleId = options.onCallScheduleId;
+      }
+
      let project: Project | null = null;

      // make sure project has enough balance.
--- a/App/FeatureSet/Notification/Services/MailService.ts
+++ b/App/FeatureSet/Notification/Services/MailService.ts
@@ -1,10 +1,4 @@
 import {
-  InternalSmtpEmail,
-  InternalSmtpFromName,
-  InternalSmtpHost,
-  InternalSmtpPassword,
-  InternalSmtpPort,
-  InternalSmtpSecure,
  SendGridConfig,
  getEmailServerType,
  getGlobalSMTPConfig,
@@ -37,6 +31,98 @@ import nodemailer, { Transporter } from "nodemailer";
 import Path from "path";
 import * as tls from "tls";

+// Connection pool for email transporters
+class TransporterPool {
+  private static pools: Map<string, Transporter> = new Map();
+  private static semaphore: Map<string, number> = new Map();
+  private static readonly MAX_CONCURRENT_CONNECTIONS = 100;
+
+  public static getTransporter(
+    emailServer: EmailServer,
+    options: { timeout?: number | undefined },
+  ): Transporter {
+    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;
+
+    if (!this.pools.has(key)) {
+      const transporter: Transporter = this.createTransporter(
+        emailServer,
+        options,
+      );
+      this.pools.set(key, transporter);
+      this.semaphore.set(key, 0);
+    }
+
+    return this.pools.get(key)!;
+  }
+
+  private static createTransporter(
+    emailServer: EmailServer,
+    options: { timeout?: number | undefined },
+  ): Transporter {
+    let tlsOptions: tls.ConnectionOptions | undefined = undefined;
+
+    if (!emailServer.secure) {
+      tlsOptions = {
+        rejectUnauthorized: false,
+      };
+    }
+
+    return nodemailer.createTransport({
+      host: emailServer.host.toString(),
+      port: emailServer.port.toNumber(),
+      secure: emailServer.secure,
+      tls: tlsOptions,
+      auth:
+        emailServer.username && emailServer.password
+          ? {
+              user: emailServer.username,
+              pass: emailServer.password,
+            }
+          : undefined,
+      connectionTimeout: options.timeout || 60000,
+      pool: true, // Enable connection pooling
+      maxConnections: this.MAX_CONCURRENT_CONNECTIONS,
+    });
+  }
+
+  public static async acquireConnection(
+    emailServer: EmailServer,
+  ): Promise<void> {
+    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;
+
+    while ((this.semaphore.get(key) || 0) >= this.MAX_CONCURRENT_CONNECTIONS) {
+      await new Promise<void>((resolve: () => void) => {
+        setTimeout(resolve, 100);
+      });
+    }
+
+    this.semaphore.set(key, (this.semaphore.get(key) || 0) + 1);
+  }
+
+  public static releaseConnection(emailServer: EmailServer): void {
+    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;
+    const current: number = this.semaphore.get(key) || 0;
+    this.semaphore.set(key, Math.max(0, current - 1));
+  }
+
+  public static async cleanup(): Promise<void> {
+    const closePromises: Promise<void>[] = [];
+
+    for (const [, transporter] of this.pools) {
+      closePromises.push(
+        new Promise<void>((resolve: () => void) => {
+          transporter.close();
+          resolve();
+        }),
+      );
+    }
+
+    await Promise.all(closePromises);
+    this.pools.clear();
+    this.semaphore.clear();
+  }
+}
+
 export default class MailService {
  public static isSMTPConfigValid(obj: JSONObject): boolean {
    if (!obj["SMTP_USERNAME"]) {
@@ -110,19 +196,6 @@ export default class MailService {
    };
  }

-  public static getInternalEmailServer(): EmailServer {
-    return {
-      id: undefined,
-      username: InternalSmtpEmail.toString(),
-      password: InternalSmtpPassword,
-      host: InternalSmtpHost,
-      port: InternalSmtpPort,
-      fromEmail: InternalSmtpEmail,
-      fromName: InternalSmtpFromName,
-      secure: InternalSmtpSecure,
-    };
-  }
-
  public static async getGlobalFromEmail(): Promise<Email> {
    const emailServer: EmailServer | null = await this.getGlobalSmtpSettings();

@@ -205,30 +278,7 @@ export default class MailService {
      timeout?: number | undefined;
    },
  ): Transporter {
-    let tlsOptions: tls.ConnectionOptions | undefined = undefined;
-
-    if (!emailServer.secure) {
-      tlsOptions = {
-        rejectUnauthorized: false,
-      };
-    }
-
-    const privateMailer: Transporter = nodemailer.createTransport({
-      host: emailServer.host.toString(),
-      port: emailServer.port.toNumber(),
-      secure: emailServer.secure,
-      tls: tlsOptions,
-      auth:
-        emailServer.username && emailServer.password
-          ? {
-              user: emailServer.username,
-              pass: emailServer.password,
-            }
-          : undefined,
-      connectionTimeout: options.timeout || undefined,
-    });
-
-    return privateMailer;
+    return TransporterPool.getTransporter(emailServer, options);
  }

  private static async transportMail(
@@ -242,12 +292,49 @@ export default class MailService {
    const mailer: Transporter = this.createMailer(options.emailServer, {
      timeout: options.timeout,
    });
-    await mailer.sendMail({
-      from: `${options.emailServer.fromName.toString()} <${options.emailServer.fromEmail.toString()}>`,
-      to: mail.toEmail.toString(),
-      subject: mail.subject,
-      html: mail.body,
-    });
+
+    let lastError: any;
+    const maxRetries: number = 3;
+
+    // Acquire connection slot to prevent overwhelming the server
+    await TransporterPool.acquireConnection(options.emailServer);
+
+    try {
+      for (let attempt: number = 1; attempt <= maxRetries; attempt++) {
+        try {
+          await mailer.sendMail({
+            from: `${options.emailServer.fromName.toString()} <${options.emailServer.fromEmail.toString()}>`,
+            to: mail.toEmail.toString(),
+            subject: mail.subject,
+            html: mail.body,
+          });
+          return; // Success, exit the function
+        } catch (error) {
+          lastError = error;
+          logger.error(`Email send attempt ${attempt} failed:`);
+          logger.error(error);
+
+          if (attempt === maxRetries) {
+            break; // Don't wait after the last attempt
+          }
+
+          // Wait before retrying with jitter to prevent thundering herd
+          const baseWaitTime: number = Math.pow(2, attempt - 1) * 1000;
+          const jitter: number = Math.random() * 1000; // Add up to 1 second of jitter
+          const waitTime: number = baseWaitTime + jitter;
+
+          await new Promise<void>((resolve: (value: void) => void) => {
+            setTimeout(resolve, waitTime);
+          });
+        }
+      }
+
+      // If we reach here, all retries failed
+      throw lastError;
+    } finally {
+      // Always release the connection slot
+      TransporterPool.releaseConnection(options.emailServer);
+    }
  }

  public static async send(
@@ -258,6 +345,18 @@ export default class MailService {
          emailServer?: EmailServer | undefined;
          userOnCallLogTimelineId?: ObjectID | undefined;
          timeout?: number | undefined;
+          incidentId?: ObjectID | undefined;
+          alertId?: ObjectID | undefined;
+          scheduledMaintenanceId?: ObjectID | undefined;
+          statusPageId?: ObjectID | undefined;
+          statusPageAnnouncementId?: ObjectID | undefined;
+          userId?: ObjectID | undefined;
+          // On-call policy related fields
+          onCallPolicyId?: ObjectID | undefined;
+          onCallPolicyEscalationRuleId?: ObjectID | undefined;
+          onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+          onCallScheduleId?: ObjectID | undefined;
+          teamId?: ObjectID | undefined;
        }
      | undefined,
  ): Promise<void> {
@@ -272,6 +371,48 @@ export default class MailService {
      if (options.emailServer?.id) {
        emailLog.projectSmtpConfigId = options.emailServer?.id;
      }
+
+      if (options.incidentId) {
+        emailLog.incidentId = options.incidentId;
+      }
+
+      if (options.alertId) {
+        emailLog.alertId = options.alertId;
+      }
+
+      if (options.scheduledMaintenanceId) {
+        emailLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
+      }
+
+      if (options.statusPageId) {
+        emailLog.statusPageId = options.statusPageId;
+      }
+
+      if (options.statusPageAnnouncementId) {
+        emailLog.statusPageAnnouncementId = options.statusPageAnnouncementId;
+      }
+
+      if (options.userId) {
+        emailLog.userId = options.userId;
+      }
+
+      if (options.teamId) {
+        emailLog.teamId = options.teamId;
+      }
+
+      // Set OnCall-related fields
+      if (options.onCallPolicyId) {
+        emailLog.onCallDutyPolicyId = options.onCallPolicyId;
+      }
+
+      if (options.onCallPolicyEscalationRuleId) {
+        emailLog.onCallDutyPolicyEscalationRuleId =
+          options.onCallPolicyEscalationRuleId;
+      }
+
+      if (options.onCallScheduleId) {
+        emailLog.onCallDutyPolicyScheduleId = options.onCallScheduleId;
+      }
    }

    // default vars.
@@ -434,17 +575,6 @@ export default class MailService {
        options.emailServer = globalEmailServer;
      }

-      if (
-        emailServerType === EmailServerType.Internal &&
-        (!options || !options.emailServer)
-      ) {
-        if (!options) {
-          options = {};
-        }
-
-        options.emailServer = this.getInternalEmailServer();
-      }
-
      if (options && options.emailServer && emailLog) {
        emailLog.fromEmail = options.emailServer.fromEmail;
      }
@@ -518,4 +648,8 @@ export default class MailService {
      throw err;
    }
  }
+
+  public static async cleanup(): Promise<void> {
+    await TransporterPool.cleanup();
+  }
 }
--- a/App/FeatureSet/Notification/Services/PushNotificationService.ts
+++ b/App/FeatureSet/Notification/Services/PushNotificationService.ts
@@ -0,0 +1,44 @@
+import PushNotificationRequest from "Common/Types/PushNotification/PushNotificationRequest";
+import ObjectID from "Common/Types/ObjectID";
+import PushNotificationServiceCommon from "Common/Server/Services/PushNotificationService";
+
+export default class PushNotificationService {
+  public static async send(
+    request: PushNotificationRequest,
+    options: {
+      projectId?: ObjectID | undefined;
+      isSensitive?: boolean;
+      userOnCallLogTimelineId?: ObjectID | undefined;
+      incidentId?: ObjectID | undefined;
+      alertId?: ObjectID | undefined;
+      scheduledMaintenanceId?: ObjectID | undefined;
+      statusPageId?: ObjectID | undefined;
+      statusPageAnnouncementId?: ObjectID | undefined;
+      userId?: ObjectID | undefined;
+      onCallPolicyId?: ObjectID | undefined;
+      onCallPolicyEscalationRuleId?: ObjectID | undefined;
+      onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+      onCallScheduleId?: ObjectID | undefined;
+      teamId?: ObjectID | undefined;
+    } = {},
+  ): Promise<void> {
+    // Delegate to Common service which now handles logging and timeline updates
+    await PushNotificationServiceCommon.sendPushNotification(request, {
+      projectId: options.projectId,
+      isSensitive: Boolean(options.isSensitive),
+      userOnCallLogTimelineId: options.userOnCallLogTimelineId,
+      incidentId: options.incidentId,
+      alertId: options.alertId,
+      scheduledMaintenanceId: options.scheduledMaintenanceId,
+      statusPageId: options.statusPageId,
+      statusPageAnnouncementId: options.statusPageAnnouncementId,
+      userId: options.userId,
+      onCallPolicyId: options.onCallPolicyId,
+      onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+      onCallDutyPolicyExecutionLogTimelineId:
+        options.onCallDutyPolicyExecutionLogTimelineId,
+      onCallScheduleId: options.onCallScheduleId,
+      teamId: options.teamId,
+    });
+  }
+}
--- a/App/FeatureSet/Notification/Services/SmsService.ts
+++ b/App/FeatureSet/Notification/Services/SmsService.ts
@@ -31,6 +31,18 @@ export default class SmsService {
      customTwilioConfig?: TwilioConfig | undefined;
      isSensitive?: boolean; // if true, message will not be logged
      userOnCallLogTimelineId?: ObjectID | undefined;
+      incidentId?: ObjectID | undefined;
+      alertId?: ObjectID | undefined;
+      scheduledMaintenanceId?: ObjectID | undefined;
+      statusPageId?: ObjectID | undefined;
+      statusPageAnnouncementId?: ObjectID | undefined;
+      userId?: ObjectID | undefined;
+      // On-call policy related fields
+      onCallPolicyId?: ObjectID | undefined;
+      onCallPolicyEscalationRuleId?: ObjectID | undefined;
+      onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+      onCallScheduleId?: ObjectID | undefined;
+      teamId?: ObjectID | undefined;
    },
  ): Promise<void> {
    let smsError: Error | null = null;
@@ -71,6 +83,48 @@ export default class SmsService {
        smsLog.projectId = options.projectId;
      }

+      if (options.incidentId) {
+        smsLog.incidentId = options.incidentId;
+      }
+
+      if (options.alertId) {
+        smsLog.alertId = options.alertId;
+      }
+
+      if (options.scheduledMaintenanceId) {
+        smsLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
+      }
+
+      if (options.statusPageId) {
+        smsLog.statusPageId = options.statusPageId;
+      }
+
+      if (options.statusPageAnnouncementId) {
+        smsLog.statusPageAnnouncementId = options.statusPageAnnouncementId;
+      }
+
+      if (options.userId) {
+        smsLog.userId = options.userId;
+      }
+
+      if (options.teamId) {
+        smsLog.teamId = options.teamId;
+      }
+
+      // Set OnCall-related fields
+      if (options.onCallPolicyId) {
+        smsLog.onCallDutyPolicyId = options.onCallPolicyId;
+      }
+
+      if (options.onCallPolicyEscalationRuleId) {
+        smsLog.onCallDutyPolicyEscalationRuleId =
+          options.onCallPolicyEscalationRuleId;
+      }
+
+      if (options.onCallScheduleId) {
+        smsLog.onCallDutyPolicyScheduleId = options.onCallScheduleId;
+      }
+
      const twilioConfig: TwilioConfig | null =
        options.customTwilioConfig || (await getTwilioConfig());

--- a/App/nodemon.json
+++ b/App/nodemon.json
@@ -4,5 +4,13 @@
    "ignore": [
        "greenlock.d/*"
    ],
-    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
+    "watchOptions": {
+        "useFsEvents": false,
+        "interval": 500
+    },
+    "env": {
+        "TS_NODE_TRANSPILE_ONLY": "1",
+        "TS_NODE_FILES": "false"
+    },
+    "exec": "node --inspect=0.0.0.0:9229 -r ts-node/register/transpile-only Index.ts"
 }
--- a/App/package-lock.json
+++ b/App/package-lock.json
@@ -35,8 +35,9 @@
      "version": "1.0.0",
      "license": "Apache-2.0",
      "dependencies": {
+        "@asteasolutions/zod-to-openapi": "^7.3.2",
        "@bull-board/express": "^5.21.4",
-        "@clickhouse/client": "^0.2.10",
+        "@clickhouse/client": "^1.10.1",
        "@elastic/elasticsearch": "^8.12.1",
        "@monaco-editor/react": "^4.4.6",
        "@opentelemetry/api": "^1.9.0",
@@ -64,18 +65,19 @@
        "@types/react-highlight": "^0.12.8",
        "@types/react-syntax-highlighter": "^15.5.13",
        "@types/uuid": "^8.3.4",
+        "@types/web-push": "^3.6.4",
        "acme-client": "^5.3.0",
        "airtable": "^0.12.2",
        "axios": "^1.7.2",
        "bullmq": "^5.3.3",
-        "Common": "file:../Common",
-        "cookie-parser": "^1.4.6",
+        "cookie-parser": "^1.4.7",
        "cors": "^2.8.5",
        "cron-parser": "^4.8.1",
        "crypto-js": "^4.2.0",
        "dotenv": "^16.4.4",
        "ejs": "^3.1.10",
-        "express": "^4.19.2",
+        "esbuild": "^0.25.5",
+        "express": "^4.21.1",
        "formik": "^2.4.6",
        "history": "^5.3.0",
        "ioredis": "^5.3.2",
@@ -83,7 +85,6 @@
        "json5": "^2.2.3",
        "jsonwebtoken": "^9.0.0",
        "jwt-decode": "^4.0.0",
-        "lodash": "^4.17.21",
        "marked": "^12.0.2",
        "moment": "^2.30.1",
        "moment-timezone": "^0.5.45",
@@ -91,6 +92,7 @@
        "nodemailer": "^6.9.10",
        "otpauth": "^9.3.1",
        "pg": "^8.7.3",
+        "playwright": "^1.50.0",
        "posthog-js": "^1.139.6",
        "prop-types": "^15.8.1",
        "qrcode": "^1.5.3",
@@ -113,6 +115,7 @@
        "redis-semaphore": "^5.5.1",
        "reflect-metadata": "^0.2.2",
        "remark-gfm": "^3.0.1",
+        "slackify-markdown": "^4.4.0",
        "slugify": "^1.6.5",
        "socket.io": "^4.7.4",
        "socket.io-client": "^4.7.5",
@@ -122,9 +125,11 @@
        "twilio": "^4.22.0",
        "typeorm": "^0.3.20",
        "typeorm-extension": "^2.2.13",
-        "universal-cookie": "^4.0.4",
+        "universal-cookie": "^7.2.1",
        "use-async-effect": "^2.2.6",
-        "uuid": "^8.3.2"
+        "uuid": "^8.3.2",
+        "web-push": "^3.6.7",
+        "zod": "^3.25.30"
      },
      "devDependencies": {
        "@faker-js/faker": "^8.0.2",
@@ -138,7 +143,6 @@
        "@types/jest": "^28.1.4",
        "@types/json2csv": "^5.0.3",
        "@types/jsonwebtoken": "^8.5.9",
-        "@types/lodash": "^4.14.202",
        "@types/node": "^17.0.45",
        "@types/node-cron": "^3.0.7",
        "@types/nodemailer": "^6.4.7",
@@ -152,6 +156,7 @@
        "jest-environment-jsdom": "^29.7.0",
        "jest-mock-extended": "^3.0.5",
        "react-test-renderer": "^18.2.0",
+        "sass": "^1.89.2",
        "ts-jest": "^28.0.5"
      }
    },
--- a/Common/Models/DatabaseModels/AcmeCertificate.ts
+++ b/Common/Models/DatabaseModels/AcmeCertificate.ts
@@ -104,6 +104,7 @@ export default class AcmeCertificate extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/AcmeChallenge.ts
+++ b/Common/Models/DatabaseModels/AcmeChallenge.ts
@@ -80,6 +80,7 @@ export default class AcmeChallenge extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/Alert.ts
+++ b/Common/Models/DatabaseModels/Alert.ts
@@ -299,6 +299,7 @@ export default class Alert extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -570,11 +571,13 @@ export default class Alert extends BaseModel {
  @TableColumn({
    type: TableColumnType.ObjectID,
    required: true,
+    isDefaultValueColumn: true,
    title: "Current Alert State ID",
    description: "Current Alert State ID",
  })
  @Column({
    type: ColumnType.ObjectID,
+
    nullable: false,
    transformer: ObjectID.getDatabaseTransformer(),
  })
@@ -758,12 +761,7 @@ export default class Alert extends BaseModel {
  public customFields?: JSONObject = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateAlert,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -775,10 +773,13 @@ export default class Alert extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified Of Alert Creation?",
    description: "Are owners notified of when this alert is created?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -936,6 +937,7 @@ export default class Alert extends BaseModel {
    title: "Is created automatically?",
    description:
      "Is this alert created by OneUptime Probe or Workers automatically (and not created manually by a user)?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -1028,6 +1030,7 @@ export default class Alert extends BaseModel {
    isDefaultValueColumn: false,
    required: false,
    type: TableColumnType.Number,
+    computed: true,
    title: "Alert Number",
    description: "Alert Number",
  })
--- a/Common/Models/DatabaseModels/AlertCustomField.ts
+++ b/Common/Models/DatabaseModels/AlertCustomField.ts
@@ -218,7 +218,7 @@ export default class AlertCustomField extends BaseModel {
    type: ColumnType.ShortText,
    length: ColumnLength.ShortText,
  })
-  public type?: CustomFieldType = undefined;
+  public customFieldType?: CustomFieldType = undefined;

  @ColumnAccessControl({
    create: [
@@ -297,6 +297,7 @@ export default class AlertCustomField extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/AlertFeed.ts
+++ b/Common/Models/DatabaseModels/AlertFeed.ts
@@ -282,6 +282,7 @@ export default class AlertFeed extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/AlertInternalNote.ts
+++ b/Common/Models/DatabaseModels/AlertInternalNote.ts
@@ -271,6 +271,7 @@ export default class AlertInternalNote extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -340,12 +341,7 @@ export default class AlertInternalNote extends BaseModel {
  public note?: string = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateAlertInternalNote,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -357,10 +353,13 @@ export default class AlertInternalNote extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/AlertNoteTemplate.ts
+++ b/Common/Models/DatabaseModels/AlertNoteTemplate.ts
@@ -314,6 +314,7 @@ export default class AlertNoteTemplate extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/AlertOwnerTeam.ts
+++ b/Common/Models/DatabaseModels/AlertOwnerTeam.ts
@@ -64,6 +64,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "AlertOwnerTeam",
 })
+@Index(["alertId", "teamId", "projectId"])
 export default class AlertOwnerTeam extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -343,6 +344,7 @@ export default class AlertOwnerTeam extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -406,6 +408,7 @@ export default class AlertOwnerTeam extends BaseModel {
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/AlertOwnerUser.ts
+++ b/Common/Models/DatabaseModels/AlertOwnerUser.ts
@@ -63,6 +63,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "AlertOwnerUser",
 })
+@Index(["alertId", "userId", "projectId"])
 export default class AlertOwnerUser extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -342,6 +343,7 @@ export default class AlertOwnerUser extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -405,6 +407,7 @@ export default class AlertOwnerUser extends BaseModel {
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/AlertSeverity.ts
+++ b/Common/Models/DatabaseModels/AlertSeverity.ts
@@ -76,6 +76,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "AlertSeverity",
 })
+@Index(["projectId", "order"])
 export default class AlertSeverity extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -192,6 +193,7 @@ export default class AlertSeverity extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -314,6 +316,7 @@ export default class AlertSeverity extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/AlertState.ts
+++ b/Common/Models/DatabaseModels/AlertState.ts
@@ -76,6 +76,10 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "AlertState",
 })
+@Index(["projectId", "isCreatedState"])
+@Index(["projectId", "isResolvedState"])
+@Index(["projectId", "isAcknowledgedState"])
+@Index(["projectId", "order"])
 export default class AlertState extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -290,6 +294,7 @@ export default class AlertState extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/AlertStateTimeline.ts
+++ b/Common/Models/DatabaseModels/AlertStateTimeline.ts
@@ -60,6 +60,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "AlertStateTimeline",
 })
+@Index(["alertId", "startsAt"])
@TableMetadata({
  tableName: "AlertStateTimeline",
  singularName: "Alert State Timeline",
@@ -274,6 +275,7 @@ export default class AlertStateTimeline extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -387,12 +389,7 @@ export default class AlertStateTimeline extends BaseModel {
  public alertStateId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateAlertStateTimeline,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -404,10 +401,13 @@ export default class AlertStateTimeline extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of state change?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/ApiKey.ts
+++ b/Common/Models/DatabaseModels/ApiKey.ts
@@ -201,6 +201,7 @@ export default class ApiKey extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -281,6 +282,7 @@ export default class ApiKey extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -347,11 +349,7 @@ export default class ApiKey extends BaseModel {
  public expiresAt?: Date = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ReadProjectApiKey,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -368,6 +366,7 @@ export default class ApiKey extends BaseModel {
    type: TableColumnType.ObjectID,
    isDefaultValueColumn: false,
    title: "API Key",
+    computed: true,
    description: "Secret API Key",
  })
  @Column({
--- a/Common/Models/DatabaseModels/ApiKeyPermission.ts
+++ b/Common/Models/DatabaseModels/ApiKeyPermission.ts
@@ -291,6 +291,7 @@ export default class APIKeyPermission extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -425,7 +426,11 @@ export default class APIKeyPermission extends BaseModel {
      Permission.EditProjectApiKey,
    ],
  })
-  @TableColumn({ isDefaultValueColumn: true, type: TableColumnType.Boolean })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    defaultValue: false,
+  })
  @Column({
    type: ColumnType.Boolean,
    default: false,
--- a/Common/Models/DatabaseModels/BillingInvoice.ts
+++ b/Common/Models/DatabaseModels/BillingInvoice.ts
@@ -172,6 +172,7 @@ export default class BillingInvoice extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/BillingPaymentMethod.ts
+++ b/Common/Models/DatabaseModels/BillingPaymentMethod.ts
@@ -174,6 +174,7 @@ export default class BillingPaymentMethod extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -234,7 +235,7 @@ export default class BillingPaymentMethod extends BaseModel {
    nullable: false,
    unique: false,
  })
-  public type?: string = undefined;
+  public paymentMethodType?: string = undefined;

  @ColumnAccessControl({
    create: [],
--- a/Common/Models/DatabaseModels/CallLog.ts
+++ b/Common/Models/DatabaseModels/CallLog.ts
@@ -1,5 +1,14 @@
 import Project from "./Project";
+import Incident from "./Incident";
+import Alert from "./Alert";
+import ScheduledMaintenance from "./ScheduledMaintenance";
+import StatusPage from "./StatusPage";
+import StatusPageAnnouncement from "./StatusPageAnnouncement";
 import User from "./User";
+import OnCallDutyPolicy from "./OnCallDutyPolicy";
+import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
+import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
+import Team from "./Team";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import CallStatus from "../../Types/Call/CallStatus";
@@ -247,6 +256,7 @@ export default class CallLog extends BaseModel {
    description: "Call Cost in USD Cents",
    canReadOnRelationQuery: false,
    isDefaultValueColumn: true,
+    defaultValue: 0,
  })
  @Column({
    nullable: false,
@@ -255,6 +265,575 @@ export default class CallLog extends BaseModel {
  })
  public callCostInUSDCents?: number = undefined;

+  // Relations to resources that triggered this Call (nullable)
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentId",
+    type: TableColumnType.Entity,
+    modelType: Incident,
+    title: "Incident",
+    description: "Incident associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Incident;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentId" })
+  public incident?: Incident = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Incident ID",
+    description: "ID of Incident associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User who initiated this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "User ID",
+    description: "ID of User who initiated this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "alertId",
+    type: TableColumnType.Entity,
+    modelType: Alert,
+    title: "Alert",
+    description: "Alert associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Alert;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "alertId" })
+  public alert?: Alert = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert ID",
+    description: "ID of Alert associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public alertId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "scheduledMaintenanceId",
+    type: TableColumnType.Entity,
+    modelType: ScheduledMaintenance,
+    title: "Scheduled Maintenance",
+    description: "Scheduled Maintenance associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return ScheduledMaintenance;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "scheduledMaintenanceId" })
+  public scheduledMaintenance?: ScheduledMaintenance = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Scheduled Maintenance ID",
+    description:
+      "ID of Scheduled Maintenance associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public scheduledMaintenanceId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPageId",
+    type: TableColumnType.Entity,
+    modelType: StatusPage,
+    title: "Status Page",
+    description: "Status Page associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPage;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "statusPageId" })
+  public statusPage?: StatusPage = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Status Page ID",
+    description: "ID of Status Page associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPageId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPageAnnouncementId",
+    type: TableColumnType.Entity,
+    modelType: StatusPageAnnouncement,
+    title: "Status Page Announcement",
+    description: "Status Page Announcement associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPageAnnouncement;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "statusPageAnnouncementId" })
+  public statusPageAnnouncement?: StatusPageAnnouncement = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Status Page Announcement ID",
+    description:
+      "ID of Status Page Announcement associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPageAnnouncementId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicy,
+    title: "On-Call Duty Policy",
+    description: "On-Call Duty Policy associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicy;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyId" })
+  public onCallDutyPolicy?: OnCallDutyPolicy = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy ID",
+    description: "ID of On-Call Duty Policy associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyEscalationRuleId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicyEscalationRule,
+    title: "On-Call Duty Policy Escalation Rule",
+    description:
+      "On-Call Duty Policy Escalation Rule associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicyEscalationRule;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyEscalationRuleId" })
+  public onCallDutyPolicyEscalationRule?: OnCallDutyPolicyEscalationRule =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy Escalation Rule ID",
+    description:
+      "ID of On-Call Duty Policy Escalation Rule associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyEscalationRuleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyScheduleId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicySchedule,
+    title: "On-Call Duty Policy Schedule",
+    description:
+      "On-Call Duty Policy Schedule associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicySchedule;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyScheduleId" })
+  public onCallDutyPolicySchedule?: OnCallDutyPolicySchedule = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy Schedule ID",
+    description:
+      "ID of On-Call Duty Policy Schedule associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyScheduleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "teamId",
+    type: TableColumnType.Entity,
+    modelType: Team,
+    title: "Team",
+    description: "Team associated with this Call (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Team;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "teamId" })
+  public team?: Team = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Team ID",
+    description: "ID of Team associated with this Call (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public teamId?: ObjectID = undefined;
+
  @ColumnAccessControl({
    create: [],
    read: [],
@@ -264,6 +843,7 @@ export default class CallLog extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/CopilotAction.ts
+++ b/Common/Models/DatabaseModels/CopilotAction.ts
@@ -289,6 +289,7 @@ export default class CopilotAction extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -728,6 +729,7 @@ export default class CopilotAction extends BaseModel {
    type: TableColumnType.Boolean,
    title: "Is Priority",
    description: "Is Priority",
+    defaultValue: false,
  })
  @Column({
    nullable: false,
--- a/Common/Models/DatabaseModels/CopilotActionTypePriority.ts
+++ b/Common/Models/DatabaseModels/CopilotActionTypePriority.ts
@@ -250,6 +250,7 @@ export default class CopilotActionTypePriority extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/CopilotCodeRepository.ts
+++ b/Common/Models/DatabaseModels/CopilotCodeRepository.ts
@@ -208,6 +208,7 @@ export default class CopilotCodeRepository extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -334,6 +335,7 @@ export default class CopilotCodeRepository extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -425,12 +427,7 @@ export default class CopilotCodeRepository extends BaseModel {
  public labels?: Array<Label> = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateCopilotCodeRepository,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -449,6 +446,7 @@ export default class CopilotCodeRepository extends BaseModel {
  @TableColumn({
    type: TableColumnType.ObjectID,
    isDefaultValueColumn: false,
+    computed: true,
    title: "Secret Token",
    description:
      "Secret Token for this code repository. This is used to connect this code repository to OneUptime.",
--- a/Common/Models/DatabaseModels/CopilotPullRequest.ts
+++ b/Common/Models/DatabaseModels/CopilotPullRequest.ts
@@ -237,6 +237,7 @@ export default class CopilotPullRequest extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/Dashboard.ts
+++ b/Common/Models/DatabaseModels/Dashboard.ts
@@ -188,6 +188,7 @@ export default class Dashboard extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -306,6 +307,7 @@ export default class Dashboard extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/DataMigration.ts
+++ b/Common/Models/DatabaseModels/DataMigration.ts
@@ -145,6 +145,7 @@ export default class DataMigration extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts
+++ b/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts
@@ -56,6 +56,7 @@ export default class DatabaseBaseModel extends BaseEntity {
    title: "ID",
    type: TableColumnType.ObjectID,
    description: "ID of this object",
+    computed: true,
  })
  @PrimaryGeneratedColumn("uuid")
  public _id?: string = undefined;
@@ -63,6 +64,7 @@ export default class DatabaseBaseModel extends BaseEntity {
  @TableColumn({
    title: "Created At",
    type: TableColumnType.Date,
+    computed: true,
    description: "Date and Time when the object was created.",
  })
  @CreateDateColumn({
@@ -73,6 +75,7 @@ export default class DatabaseBaseModel extends BaseEntity {
  @TableColumn({
    title: "Updated At",
    type: TableColumnType.Date,
+    computed: true,
    description: "Date and Time when the object was updated.",
  })
  @UpdateDateColumn({
@@ -83,6 +86,7 @@ export default class DatabaseBaseModel extends BaseEntity {
  @TableColumn({
    title: "Deleted At",
    type: TableColumnType.Date,
+    computed: true,
    description: "Date and Time when the object was deleted.",
  })
  @DeleteDateColumn({
@@ -93,6 +97,7 @@ export default class DatabaseBaseModel extends BaseEntity {
  @TableColumn({
    title: "Version",
    type: TableColumnType.Number,
+    computed: true,
    description: "Object version",
    hideColumnInDocumentation: true,
  })
@@ -651,7 +656,13 @@ export default class DatabaseBaseModel extends BaseEntity {
    json = JSONFunctions.deserialize(json);
    const baseModel: T = new type();

-    for (const key of Object.keys(json)) {
+    for (let key of Object.keys(json)) {
+      if (key === "id") {
+        key = "_id";
+        json["_id"] = json["id"];
+        delete json["id"];
+      }
+
      const tableColumnMetadata: TableColumnMetadata =
        baseModel.getTableColumnMetadata(key);
      if (tableColumnMetadata) {
--- a/Common/Models/DatabaseModels/DatabaseBaseModel/FileModel.ts
+++ b/Common/Models/DatabaseModels/DatabaseBaseModel/FileModel.ts
@@ -21,8 +21,8 @@ export default class FileModel extends BaseModel {
  }

  @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
    update: [],
  })
  @TableColumn({
@@ -37,8 +37,8 @@ export default class FileModel extends BaseModel {
  public file?: Buffer = undefined;

  @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
    update: [],
  })
  @TableColumn({
@@ -56,8 +56,8 @@ export default class FileModel extends BaseModel {
  public name?: string = undefined;

  @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
    update: [],
  })
  @TableColumn({
@@ -70,11 +70,11 @@ export default class FileModel extends BaseModel {
    type: ColumnType.ShortText,
    length: ColumnLength.ShortText,
  })
-  public type?: MimeType = undefined;
+  public fileType?: MimeType = undefined;

  @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
    update: [],
  })
  @TableColumn({
@@ -91,8 +91,8 @@ export default class FileModel extends BaseModel {
  public slug?: string = undefined;

  @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
    update: [],
  })
  @TableColumn({
--- a/Common/Models/DatabaseModels/Domain.ts
+++ b/Common/Models/DatabaseModels/Domain.ts
@@ -170,6 +170,7 @@ export default class Domain extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -257,6 +258,7 @@ export default class Domain extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -317,6 +319,7 @@ export default class Domain extends BaseModel {
    type: TableColumnType.Boolean,
    title: "Verified",
    description: "Is this domain verified?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/EmailLog.ts
+++ b/Common/Models/DatabaseModels/EmailLog.ts
@@ -1,6 +1,15 @@
 import Project from "./Project";
+import Incident from "./Incident";
+import Alert from "./Alert";
+import ScheduledMaintenance from "./ScheduledMaintenance";
+import StatusPage from "./StatusPage";
 import ProjectSmtpConfig from "./ProjectSmtpConfig";
+import StatusPageAnnouncement from "./StatusPageAnnouncement";
 import User from "./User";
+import OnCallDutyPolicy from "./OnCallDutyPolicy";
+import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
+import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
+import Team from "./Team";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
@@ -289,6 +298,576 @@ export default class EmailLog extends BaseModel {
  })
  public projectSmtpConfigId?: ObjectID = undefined;

+  // Relations to resources that triggered this email (nullable)
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentId",
+    type: TableColumnType.Entity,
+    modelType: Incident,
+    title: "Incident",
+    description: "Incident associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Incident;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentId" })
+  public incident?: Incident = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Incident ID",
+    description: "ID of Incident associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User who initiated this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "User ID",
+    description: "ID of User who initiated this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "alertId",
+    type: TableColumnType.Entity,
+    modelType: Alert,
+    title: "Alert",
+    description: "Alert associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Alert;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "alertId" })
+  public alert?: Alert = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert ID",
+    description: "ID of Alert associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public alertId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "scheduledMaintenanceId",
+    type: TableColumnType.Entity,
+    modelType: ScheduledMaintenance,
+    title: "Scheduled Maintenance",
+    description: "Scheduled Maintenance associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return ScheduledMaintenance;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "scheduledMaintenanceId" })
+  public scheduledMaintenance?: ScheduledMaintenance = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Scheduled Maintenance ID",
+    description:
+      "ID of Scheduled Maintenance associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public scheduledMaintenanceId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPageId",
+    type: TableColumnType.Entity,
+    modelType: StatusPage,
+    title: "Status Page",
+    description: "Status Page associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPage;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "statusPageId" })
+  public statusPage?: StatusPage = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Status Page ID",
+    description: "ID of Status Page associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPageId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPageAnnouncementId",
+    type: TableColumnType.Entity,
+    modelType: StatusPageAnnouncement,
+    title: "Status Page Announcement",
+    description: "Status Page Announcement associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPageAnnouncement;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "statusPageAnnouncementId" })
+  public statusPageAnnouncement?: StatusPageAnnouncement = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Status Page Announcement ID",
+    description:
+      "ID of Status Page Announcement associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPageAnnouncementId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicy,
+    title: "On-Call Duty Policy",
+    description: "On-Call Duty Policy associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicy;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyId" })
+  public onCallDutyPolicy?: OnCallDutyPolicy = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy ID",
+    description:
+      "ID of On-Call Duty Policy associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyEscalationRuleId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicyEscalationRule,
+    title: "On-Call Duty Policy Escalation Rule",
+    description:
+      "On-Call Duty Policy Escalation Rule associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicyEscalationRule;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyEscalationRuleId" })
+  public onCallDutyPolicyEscalationRule?: OnCallDutyPolicyEscalationRule =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy Escalation Rule ID",
+    description:
+      "ID of On-Call Duty Policy Escalation Rule associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyEscalationRuleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyScheduleId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicySchedule,
+    title: "On-Call Duty Policy Schedule",
+    description:
+      "On-Call Duty Policy Schedule associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicySchedule;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyScheduleId" })
+  public onCallDutyPolicySchedule?: OnCallDutyPolicySchedule = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy Schedule ID",
+    description:
+      "ID of On-Call Duty Policy Schedule associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyScheduleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "teamId",
+    type: TableColumnType.Entity,
+    modelType: Team,
+    title: "Team",
+    description: "Team associated with this email (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Team;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "teamId" })
+  public team?: Team = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Team ID",
+    description: "ID of Team associated with this email (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public teamId?: ObjectID = undefined;
+
  @ColumnAccessControl({
    create: [],
    read: [],
@@ -298,6 +877,7 @@ export default class EmailLog extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/EmailVerificationToken.ts
+++ b/Common/Models/DatabaseModels/EmailVerificationToken.ts
@@ -125,6 +125,7 @@ export default class EmailVerificationToken extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/File.ts
+++ b/Common/Models/DatabaseModels/File.ts
@@ -2,11 +2,13 @@ import FileModel from "./DatabaseBaseModel/FileModel";
 import Route from "../../Types/API/Route";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import IconProp from "../../Types/Icon/IconProp";
 import Permission from "../../Types/Permission";
 import { Entity } from "typeorm";

+@EnableDocumentation()
@TableMetadata({
  tableName: "File",
  singularName: "File",
@@ -19,8 +21,8 @@ import { Entity } from "typeorm";
 })
@CrudApiEndpoint(new Route("/file"))
@TableAccessControl({
-  create: [Permission.CurrentUser],
-  read: [Permission.CurrentUser],
+  create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+  read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
  delete: [],
  update: [],
 })
--- a/Common/Models/DatabaseModels/GlobalConfig.ts
+++ b/Common/Models/DatabaseModels/GlobalConfig.ts
@@ -17,7 +17,6 @@ import Port from "../../Types/Port";
 import { Column, Entity } from "typeorm";

 export enum EmailServerType {
-  Internal = "Internal",
  Sendgrid = "Sendgrid",
  CustomSMTP = "Custom SMTP",
 }
@@ -49,6 +48,7 @@ export default class GlobalConfig extends GlobalConfigModel {
    type: TableColumnType.Boolean,
    title: "Disable Signup",
    description: "Should we disable new user sign up to this server?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -260,7 +260,7 @@ export default class GlobalConfig extends GlobalConfigModel {
    nullable: true,
    unique: false,
  })
-  public twilioSecondaryPhoneNumbers?: string = undefined; // phone numbers seperated by comma
+  public twilioSecondaryPhoneNumbers?: string = undefined; // phone numbers separated by comma

  @ColumnAccessControl({
    create: [],
@@ -339,6 +339,7 @@ export default class GlobalConfig extends GlobalConfigModel {
    type: TableColumnType.Boolean,
    title: "Is Master API Key Enabled",
    description: "Is Master API Key Enabled?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -355,6 +356,7 @@ export default class GlobalConfig extends GlobalConfigModel {
  })
  @TableColumn({
    type: TableColumnType.ObjectID,
+    computed: true,
    title: "Master API Key",
    description:
      "This API key has root access to all the resources in all the projects on OneUptime.",
--- a/Common/Models/DatabaseModels/GreenlockCertificate.ts
+++ b/Common/Models/DatabaseModels/GreenlockCertificate.ts
@@ -61,7 +61,7 @@ export default class GreenlockCertificate extends BaseModel {
    read: [],
    update: [],
  })
-  @TableColumn({ type: TableColumnType.Boolean })
+  @TableColumn({ type: TableColumnType.Boolean, defaultValue: false })
  @Column({
    type: ColumnType.Boolean,
    nullable: false,
@@ -79,6 +79,7 @@ export default class GreenlockCertificate extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/GreenlockChallenge.ts
+++ b/Common/Models/DatabaseModels/GreenlockChallenge.ts
@@ -80,6 +80,7 @@ export default class GreenlockChallenge extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/Incident.ts
+++ b/Common/Models/DatabaseModels/Incident.ts
@@ -27,6 +27,7 @@ import IconProp from "../../Types/Icon/IconProp";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
 import {
  Column,
  Entity,
@@ -229,12 +230,7 @@ export default class Incident extends BaseModel {

  @Index()
  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectIncident,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -247,6 +243,7 @@ export default class Incident extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -332,6 +329,7 @@ export default class Incident extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -530,6 +528,7 @@ export default class Incident extends BaseModel {
  @TableColumn({
    manyToOneRelationColumn: "currentIncidentStateId",
    type: TableColumnType.Entity,
+    computed: true,
    modelType: IncidentState,
    title: "Current Incident State",
    description:
@@ -571,6 +570,7 @@ export default class Incident extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.ObjectID,
+    isDefaultValueColumn: true,
    required: true,
    title: "Current Incident State ID",
    description: "Current Incident State ID",
@@ -734,26 +734,74 @@ export default class Incident extends BaseModel {
  public changeMonitorStatusToId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
      Permission.ProjectMember,
      Permission.ReadProjectIncident,
    ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
  })
  @TableColumn({
    isDefaultValueColumn: true,
-    type: TableColumnType.Boolean,
-    title: "Are subscribers notified?",
-    description: "Are subscribers notified about this incident?",
+    computed: true,
+    hideColumnInDocumentation: true,
+    type: TableColumnType.ShortText,
+    title: "Subscriber Notification Status",
+    description:
+      "Status of notification sent to subscribers about this incident",
+    defaultValue: StatusPageSubscriberNotificationStatus.Pending,
  })
  @Column({
-    type: ColumnType.Boolean,
-    default: false,
+    type: ColumnType.ShortText,
+    default: StatusPageSubscriberNotificationStatus.Pending,
  })
-  public isStatusPageSubscribersNotifiedOnIncidentCreated?: boolean = undefined;
+  public subscriberNotificationStatusOnIncidentCreated?: StatusPageSubscriberNotificationStatus =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Notification Status Message",
+    description:
+      "Status message for subscriber notifications - includes success messages, failure reasons, or skip reasons",
+    required: false,
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public subscriberNotificationStatusMessage?: string = undefined;

  @ColumnAccessControl({
    create: [
@@ -775,6 +823,7 @@ export default class Incident extends BaseModel {
    type: TableColumnType.Boolean,
    title: "Should subscribers be notified?",
    description: "Should subscribers be notified about this incident?",
+    defaultValue: true,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -817,12 +866,7 @@ export default class Incident extends BaseModel {
  public customFields?: JSONObject = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectIncident,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -834,10 +878,13 @@ export default class Incident extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified Of Resource Creation?",
    description: "Are owners notified of when this resource is created?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -1025,6 +1072,7 @@ export default class Incident extends BaseModel {
    title: "Is created automatically?",
    description:
      "Is this incident created by OneUptime Probe or Workers automatically (and not created manually by a user)?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -1099,12 +1147,7 @@ export default class Incident extends BaseModel {
  public telemetryQuery?: TelemetryQuery = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectIncident,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -1120,6 +1163,7 @@ export default class Incident extends BaseModel {
    type: TableColumnType.Number,
    title: "Incident Number",
    description: "Incident Number",
+    computed: true,
  })
  @Column({
    type: ColumnType.Number,
@@ -1171,6 +1215,7 @@ export default class Incident extends BaseModel {
    type: TableColumnType.Boolean,
    title: "Should be visible on status page?",
    description: "Should this incident be visible on the status page?",
+    defaultValue: true,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/IncidentCustomField.ts
+++ b/Common/Models/DatabaseModels/IncidentCustomField.ts
@@ -218,7 +218,7 @@ export default class IncidentCustomField extends BaseModel {
    type: ColumnType.ShortText,
    length: ColumnLength.ShortText,
  })
-  public type?: CustomFieldType = undefined;
+  public customFieldType?: CustomFieldType = undefined;

  @ColumnAccessControl({
    create: [
@@ -297,6 +297,7 @@ export default class IncidentCustomField extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/IncidentFeed.ts
+++ b/Common/Models/DatabaseModels/IncidentFeed.ts
@@ -282,6 +282,7 @@ export default class IncidentFeed extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/IncidentInternalNote.ts
+++ b/Common/Models/DatabaseModels/IncidentInternalNote.ts
@@ -271,6 +271,7 @@ export default class IncidentInternalNote extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -340,12 +341,7 @@ export default class IncidentInternalNote extends BaseModel {
  public note?: string = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentInternalNote,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -357,10 +353,13 @@ export default class IncidentInternalNote extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/IncidentNoteTemplate.ts
+++ b/Common/Models/DatabaseModels/IncidentNoteTemplate.ts
@@ -314,6 +314,7 @@ export default class IncidentNoteTemplate extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/IncidentOwnerTeam.ts
+++ b/Common/Models/DatabaseModels/IncidentOwnerTeam.ts
@@ -64,6 +64,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "IncidentOwnerTeam",
 })
+@Index(["incidentId", "teamId", "projectId"])
 export default class IncidentOwnerTeam extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -343,6 +344,7 @@ export default class IncidentOwnerTeam extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -385,12 +387,7 @@ export default class IncidentOwnerTeam extends BaseModel {
  public deletedByUserId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentOwnerTeam,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -402,10 +399,13 @@ export default class IncidentOwnerTeam extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/IncidentOwnerUser.ts
+++ b/Common/Models/DatabaseModels/IncidentOwnerUser.ts
@@ -63,6 +63,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "IncidentOwnerUser",
 })
+@Index(["incidentId", "userId", "projectId"])
 export default class IncidentOwnerUser extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -342,6 +343,7 @@ export default class IncidentOwnerUser extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -405,6 +407,7 @@ export default class IncidentOwnerUser extends BaseModel {
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/IncidentPublicNote.ts
+++ b/Common/Models/DatabaseModels/IncidentPublicNote.ts
@@ -17,6 +17,7 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";

@EnableDocumentation()
@@ -271,6 +272,7 @@ export default class IncidentPublicNote extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -340,26 +342,73 @@ export default class IncidentPublicNote extends BaseModel {
  public note?: string = undefined;

  @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentPublicNote,
+    ],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
      Permission.ProjectMember,
      Permission.ReadIncidentPublicNote,
    ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentPublicNote,
+    ],
  })
  @TableColumn({
    isDefaultValueColumn: true,
-    type: TableColumnType.Boolean,
-    title: "Are subscribers notified?",
-    description: "Are subscribers notified about this note?",
+    computed: true,
+    hideColumnInDocumentation: true,
+    type: TableColumnType.ShortText,
+    title: "Subscriber Notification Status",
+    description: "Status of notification sent to subscribers about this note",
+    defaultValue: StatusPageSubscriberNotificationStatus.Pending,
  })
  @Column({
-    type: ColumnType.Boolean,
-    default: false,
+    type: ColumnType.ShortText,
+    default: StatusPageSubscriberNotificationStatus.Pending,
  })
-  public isStatusPageSubscribersNotifiedOnNoteCreated?: boolean = undefined;
+  public subscriberNotificationStatusOnNoteCreated?: StatusPageSubscriberNotificationStatus =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentPublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentPublicNote,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentPublicNote,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Notification Status Message",
+    description:
+      "Status message for subscriber notifications - includes success messages, failure reasons, or skip reasons",
+    required: false,
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public subscriberNotificationStatusMessage?: string = undefined;

  @ColumnAccessControl({
    create: [
@@ -381,6 +430,7 @@ export default class IncidentPublicNote extends BaseModel {
    type: TableColumnType.Boolean,
    title: "Should subscribers be notified?",
    description: "Should subscribers be notified about this note?",
+    defaultValue: true,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -390,12 +440,7 @@ export default class IncidentPublicNote extends BaseModel {
    undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentPublicNote,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -407,10 +452,13 @@ export default class IncidentPublicNote extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/IncidentSeverity.ts
+++ b/Common/Models/DatabaseModels/IncidentSeverity.ts
@@ -76,6 +76,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "IncidentSeverity",
 })
+@Index(["projectId", "order"])
 export default class IncidentSeverity extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -192,6 +193,7 @@ export default class IncidentSeverity extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -314,6 +316,7 @@ export default class IncidentSeverity extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/IncidentState.ts
+++ b/Common/Models/DatabaseModels/IncidentState.ts
@@ -76,6 +76,9 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "IncidentState",
 })
+@Index(["projectId", "isCreatedState"])
+@Index(["projectId", "isResolvedState"])
+@Index(["projectId", "order"])
 export default class IncidentState extends BaseModel {
  @ColumnAccessControl({
    create: [
@@ -192,6 +195,7 @@ export default class IncidentState extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -314,6 +318,7 @@ export default class IncidentState extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/IncidentStateTimeline.ts
+++ b/Common/Models/DatabaseModels/IncidentStateTimeline.ts
@@ -19,11 +19,14 @@ import IconProp from "../../Types/Icon/IconProp";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";

@EnableDocumentation()
@CanAccessIfCanReadOn("incident")
@TenantColumn("projectId")
+@Index(["incidentId", "startsAt"]) // Composite index for efficient incident timeline queries
+@Index(["incidentId", "projectId", "startsAt"]) // Alternative composite index including project
@TableAccessControl({
  create: [
    Permission.ProjectOwner,
@@ -60,6 +63,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@Entity({
  name: "IncidentStateTimeline",
 })
+@Index(["incidentId", "startsAt"])
@TableMetadata({
  tableName: "IncidentStateTimeline",
  singularName: "Incident State Timeline",
@@ -274,6 +278,7 @@ export default class IncidentStateTimeline extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -399,19 +404,62 @@ export default class IncidentStateTimeline extends BaseModel {
      Permission.ProjectMember,
      Permission.ReadIncidentStateTimeline,
    ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentStateTimeline,
+    ],
  })
  @TableColumn({
    isDefaultValueColumn: true,
-    type: TableColumnType.Boolean,
-    title: "Are subscribers notified?",
-    description: "Are subscribers notified about this incident state change?",
+    computed: true,
+    hideColumnInDocumentation: true,
+    type: TableColumnType.ShortText,
+    title: "Subscriber Notification Status",
+    description:
+      "Status of notification sent to subscribers about this incident state change",
+    defaultValue: StatusPageSubscriberNotificationStatus.Pending,
  })
  @Column({
-    type: ColumnType.Boolean,
-    default: false,
+    type: ColumnType.ShortText,
+    default: StatusPageSubscriberNotificationStatus.Pending,
  })
-  public isStatusPageSubscribersNotified?: boolean = undefined;
+  public subscriberNotificationStatus?: StatusPageSubscriberNotificationStatus =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentStateTimeline,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentStateTimeline,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Notification Status Message",
+    description:
+      "Status message for subscriber notifications - includes success messages, failure reasons, or skip reasons",
+    required: false,
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public subscriberNotificationStatusMessage?: string = undefined;

  @ColumnAccessControl({
    create: [
@@ -433,6 +481,7 @@ export default class IncidentStateTimeline extends BaseModel {
    type: TableColumnType.Boolean,
    title: "Should subscribers be notified?",
    description: "Should subscribers be notified about this state change?",
+    defaultValue: true,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -441,12 +490,7 @@ export default class IncidentStateTimeline extends BaseModel {
  public shouldStatusPageSubscribersBeNotified?: boolean = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentStateTimeline,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -458,10 +502,13 @@ export default class IncidentStateTimeline extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of state change?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/IncidentTemplate.ts
+++ b/Common/Models/DatabaseModels/IncidentTemplate.ts
@@ -295,12 +295,7 @@ export default class IncidentTemplate extends BaseModel {

  @Index()
  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentTemplate,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -313,6 +308,7 @@ export default class IncidentTemplate extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -398,6 +394,7 @@ export default class IncidentTemplate extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/IncidentTemplateOwnerTeam.ts
+++ b/Common/Models/DatabaseModels/IncidentTemplateOwnerTeam.ts
@@ -345,6 +345,7 @@ export default class IncidentTemplateOwnerTeam extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -387,12 +388,7 @@ export default class IncidentTemplateOwnerTeam extends BaseModel {
  public deletedByUserId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentTemplateOwnerTeam,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -404,10 +400,13 @@ export default class IncidentTemplateOwnerTeam extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/IncidentTemplateOwnerUser.ts
+++ b/Common/Models/DatabaseModels/IncidentTemplateOwnerUser.ts
@@ -354,6 +354,7 @@ export default class IncidentTemplateOwnerUser extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -397,12 +398,7 @@ export default class IncidentTemplateOwnerUser extends BaseModel {
  public deletedByUserId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentTemplateOwnerUser,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -415,10 +411,13 @@ export default class IncidentTemplateOwnerUser extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/Index.ts
+++ b/Common/Models/DatabaseModels/Index.ts
@@ -100,6 +100,8 @@ import ServiceCopilotCodeRepository from "./ServiceCopilotCodeRepository";
 import ShortLink from "./ShortLink";
 // SMS
 import SmsLog from "./SmsLog";
+import PushNotificationLog from "./PushNotificationLog";
+import WorkspaceNotificationLog from "./WorkspaceNotificationLog";
 // Status Page
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
@@ -114,6 +116,7 @@ import StatusPageOwnerTeam from "./StatusPageOwnerTeam";
 import StatusPageOwnerUser from "./StatusPageOwnerUser";
 import StatusPagePrivateUser from "./StatusPagePrivateUser";
 import StatusPageResource from "./StatusPageResource";
+import StatusPageSCIM from "./StatusPageSCIM";
 import StatusPageSSO from "./StatusPageSso";
 import StatusPageSubscriber from "./StatusPageSubscriber";
 // Team
@@ -126,6 +129,7 @@ import User from "./User";
 import UserCall from "./UserCall";
 // Notification Methods
 import UserEmail from "./UserEmail";
+import UserPush from "./UserPush";
 // User Notification Rules
 import UserNotificationRule from "./UserNotificationRule";
 import UserNotificationSetting from "./UserNotificationSetting";
@@ -174,10 +178,13 @@ import WorkspaceUserAuthToken from "./WorkspaceUserAuthToken";
 import WorkspaceProjectAuthToken from "./WorkspaceProjectAuthToken";
 import WorkspaceSetting from "./WorkspaceSetting";
 import WorkspaceNotificationRule from "./WorkspaceNotificationRule";
-import ProjectUser from "./ProjectUser";
+
 import OnCallDutyPolicyUserOverride from "./OnCallDutyPolicyUserOverride";
 import MonitorFeed from "./MonitorFeed";
 import MetricType from "./MetricType";
+import ProjectSCIM from "./ProjectSCIM";
+import SCIMUser from "./SCIMUser";
+import StatusPageSCIMUser from "./StatusPageSCIMUser";

 const AllModelTypes: Array<{
  new (): BaseModel;
@@ -275,6 +282,7 @@ const AllModelTypes: Array<{

  ProjectSSO,
  StatusPageSSO,
+  StatusPageSCIM,

  MonitorProbe,

@@ -288,12 +296,15 @@ const AllModelTypes: Array<{
  StatusPageOwnerUser,

  SmsLog,
+  PushNotificationLog,
+  WorkspaceNotificationLog,
  CallLog,
  EmailLog,

  UserEmail,
  UserSms,
  UserCall,
+  UserPush,

  UserNotificationRule,
  UserOnCallLog,
@@ -371,13 +382,16 @@ const AllModelTypes: Array<{
  WorkspaceSetting,
  WorkspaceNotificationRule,

-  ProjectUser,
-
  MonitorFeed,

  MetricType,

  OnCallDutyPolicyTimeLog,
+
+  ProjectSCIM,
+  SCIMUser,
+
+  StatusPageSCIMUser
 ];

 const modelTypeMap: { [key: string]: { new (): BaseModel } } = {};
--- a/Common/Models/DatabaseModels/Label.ts
+++ b/Common/Models/DatabaseModels/Label.ts
@@ -186,6 +186,7 @@ export default class Label extends AccessControlModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -304,6 +305,7 @@ export default class Label extends AccessControlModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/MetricType.ts
+++ b/Common/Models/DatabaseModels/MetricType.ts
@@ -57,10 +57,10 @@ import TelemetryService from "./TelemetryService";
  ],
 })
@EnableWorkflow({
-  create: true,
-  delete: true,
-  update: true,
-  read: true,
+  create: false,
+  delete: false,
+  update: false,
+  read: false,
 })
@CrudApiEndpoint(new Route("/metric-type"))
@SlugifyColumn("name", "slug")
@@ -359,6 +359,7 @@ export default class MetricType extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/Monitor.ts
+++ b/Common/Models/DatabaseModels/Monitor.ts
@@ -221,12 +221,7 @@ export default class Monitor extends BaseModel {

  @Index()
  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -239,6 +234,7 @@ export default class Monitor extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -324,6 +320,7 @@ export default class Monitor extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -480,7 +477,7 @@ export default class Monitor extends BaseModel {
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
+      Permission.CreateProjectIncident,
    ],
    read: [
      Permission.ProjectOwner,
@@ -499,6 +496,7 @@ export default class Monitor extends BaseModel {
  @TableColumn({
    type: TableColumnType.ObjectID,
    required: true,
+    isDefaultValueColumn: true,
    title: "Current Monitor Status ID",
    description: "Whats the current status ID of this monitor?",
    canReadOnRelationQuery: true,
@@ -611,12 +609,7 @@ export default class Monitor extends BaseModel {
  public customFields?: JSONObject = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -628,10 +621,13 @@ export default class Monitor extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified Of Resource Creation?",
    description: "Are owners notified of when this resource is created?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -667,6 +663,7 @@ export default class Monitor extends BaseModel {
    isDefaultValueColumn: true,
    title: "Disable Monitoring",
    description: "Disable active monitoring for this resource?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -784,6 +781,7 @@ export default class Monitor extends BaseModel {
    title: "Disable Monitoring because of Ongoing Scheduled Maintenance Event",
    description:
      "Disable Monitoring because of Ongoing Scheduled Maintenance Event",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -811,6 +809,7 @@ export default class Monitor extends BaseModel {
    title: "Disable Monitoring because of Manual Incident",
    description:
      "Disable Monitoring because of Incident which is creeated manually by user.",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -850,12 +849,7 @@ export default class Monitor extends BaseModel {
  public serverMonitorRequestReceivedAt?: Date = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -874,6 +868,7 @@ export default class Monitor extends BaseModel {
    type: TableColumnType.ObjectID,
    required: false,
    isDefaultValueColumn: false,
+    computed: true,
    title: "Server Monitor Secret Key",
    description:
      "This field is for Server Monitor only. Secret Key to authenticate the request.",
@@ -886,12 +881,7 @@ export default class Monitor extends BaseModel {
  public serverMonitorSecretKey?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -910,6 +900,7 @@ export default class Monitor extends BaseModel {
    type: TableColumnType.ObjectID,
    required: false,
    isDefaultValueColumn: false,
+    computed: true,
    title: "Incoming Request Secret Key",
    description:
      "This field is for Incoming Request Monitor only. Secret Key to authenticate the request.",
@@ -993,6 +984,7 @@ export default class Monitor extends BaseModel {
    title: "All Probes Disconnected From This Monitor",
    description:
      "All Probes Disconnected From This Monitor. Is this monitor not being monitored?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
@@ -1017,6 +1009,7 @@ export default class Monitor extends BaseModel {
    title: "No Probe Enabled On This Monitor",
    description:
      "No Probe Enabled On This Monitor. Is this monitor not being monitored?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Common/Models/DatabaseModels/MonitorCustomField.ts
+++ b/Common/Models/DatabaseModels/MonitorCustomField.ts
@@ -218,7 +218,7 @@ export default class MonitorCustomField extends BaseModel {
    type: ColumnType.ShortText,
    length: ColumnLength.ShortText,
  })
-  public type?: CustomFieldType = undefined;
+  public customFieldType?: CustomFieldType = undefined;

  @ColumnAccessControl({
    create: [
@@ -297,6 +297,7 @@ export default class MonitorCustomField extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/MonitorFeed.ts
+++ b/Common/Models/DatabaseModels/MonitorFeed.ts
@@ -276,6 +276,7 @@ export default class MonitorFeed extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/MonitorGroup.ts
+++ b/Common/Models/DatabaseModels/MonitorGroup.ts
@@ -222,12 +222,7 @@ export default class MonitorGroup extends BaseModel {

  @Index()
  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateMonitorGroup,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -240,6 +235,7 @@ export default class MonitorGroup extends BaseModel {
    required: true,
    unique: true,
    type: TableColumnType.Slug,
+    computed: true,
    title: "Slug",
    description: "Friendly globally unique name for your object",
  })
@@ -325,6 +321,7 @@ export default class MonitorGroup extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
--- a/Common/Models/DatabaseModels/MonitorGroupOwnerTeam.ts
+++ b/Common/Models/DatabaseModels/MonitorGroupOwnerTeam.ts
@@ -353,6 +353,7 @@ export default class MonitorGroupOwnerTeam extends BaseModel {
    manyToOneRelationColumn: "deletedByUserId",
    type: TableColumnType.Entity,
    title: "Deleted by User",
+    modelType: User,
    description:
      "Relation to User who deleted this object (if this object was deleted by a User)",
  })
@@ -395,12 +396,7 @@ export default class MonitorGroupOwnerTeam extends BaseModel {
  public deletedByUserId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateMonitorGroupOwnerTeam,
-    ],
+    create: [],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -412,10 +408,13 @@ export default class MonitorGroupOwnerTeam extends BaseModel {
  @Index()
  @TableColumn({
    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
    required: true,
    isDefaultValueColumn: true,
    title: "Are Owners Notified",
    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
  })
  @Column({
    type: ColumnType.Boolean,
--- a/Show More
+++ b/Show More