diff --git a/bruno/API Keys/Create API Key.bru b/bruno/API Keys/Create API Key.bru
deleted file mode 100644
index 009b4b049..000000000
--- a/bruno/API Keys/Create API Key.bru	
+++ /dev/null
@@ -1,17 +0,0 @@
-meta {
-  name: Create API Key
-  type: http
-  seq: 1
-}
-
-put {
-  url: http://localhost:3000/api/v1/api-key
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "isRoot": true
-  }
-}
diff --git a/bruno/API Keys/Delete API Key.bru b/bruno/API Keys/Delete API Key.bru
deleted file mode 100644
index 9285f7889..000000000
--- a/bruno/API Keys/Delete API Key.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: Delete API Key
-  type: http
-  seq: 2
-}
-
-delete {
-  url: http://localhost:3000/api/v1/api-key/dm47aacqxxn3ubj
-  body: none
-  auth: inherit
-}
diff --git a/bruno/API Keys/List API Key Actions.bru b/bruno/API Keys/List API Key Actions.bru
deleted file mode 100644
index ae5b721e1..000000000
--- a/bruno/API Keys/List API Key Actions.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: List API Key Actions
-  type: http
-  seq: 6
-}
-
-get {
-  url: http://localhost:3000/api/v1/api-key/ex0izu2c37fjz9x/actions
-  body: none
-  auth: inherit
-}
diff --git a/bruno/API Keys/List Org API Keys.bru b/bruno/API Keys/List Org API Keys.bru
deleted file mode 100644
index 468e964b9..000000000
--- a/bruno/API Keys/List Org API Keys.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: List Org API Keys
-  type: http
-  seq: 4
-}
-
-get {
-  url: http://localhost:3000/api/v1/org/home-lab/api-keys
-  body: none
-  auth: inherit
-}
diff --git a/bruno/API Keys/List Root API Keys.bru b/bruno/API Keys/List Root API Keys.bru
deleted file mode 100644
index 8ef31b68c..000000000
--- a/bruno/API Keys/List Root API Keys.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: List Root API Keys
-  type: http
-  seq: 3
-}
-
-get {
-  url: http://localhost:3000/api/v1/root/api-keys
-  body: none
-  auth: inherit
-}
diff --git a/bruno/API Keys/Set API Key Actions.bru b/bruno/API Keys/Set API Key Actions.bru
deleted file mode 100644
index 54a35c438..000000000
--- a/bruno/API Keys/Set API Key Actions.bru	
+++ /dev/null
@@ -1,17 +0,0 @@
-meta {
-  name: Set API Key Actions
-  type: http
-  seq: 5
-}
-
-post {
-  url: http://localhost:3000/api/v1/api-key/ex0izu2c37fjz9x/actions
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "actionIds": ["listSites"]
-  }
-}
diff --git a/bruno/API Keys/Set API Key Orgs.bru b/bruno/API Keys/Set API Key Orgs.bru
deleted file mode 100644
index 3f0676c5b..000000000
--- a/bruno/API Keys/Set API Key Orgs.bru	
+++ /dev/null
@@ -1,17 +0,0 @@
-meta {
-  name: Set API Key Orgs
-  type: http
-  seq: 7
-}
-
-post {
-  url: http://localhost:3000/api/v1/api-key/ex0izu2c37fjz9x/orgs
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "orgIds": ["home-lab"]
-  }
-}
diff --git a/bruno/API Keys/folder.bru b/bruno/API Keys/folder.bru
deleted file mode 100644
index bb8cd5c73..000000000
--- a/bruno/API Keys/folder.bru	
+++ /dev/null
@@ -1,3 +0,0 @@
-meta {
-  name: API Keys
-}
diff --git a/bruno/Auth/2fa-disable.bru b/bruno/Auth/2fa-disable.bru
deleted file mode 100644
index c98539c73..000000000
--- a/bruno/Auth/2fa-disable.bru
+++ /dev/null
@@ -1,18 +0,0 @@
-meta {
-  name: 2fa-disable
-  type: http
-  seq: 6
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/2fa/disable
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "password": "aaaaa-1A",
-      "code": "377289"
-  }
-}
diff --git a/bruno/Auth/2fa-enable.bru b/bruno/Auth/2fa-enable.bru
deleted file mode 100644
index a3a01d177..000000000
--- a/bruno/Auth/2fa-enable.bru
+++ /dev/null
@@ -1,17 +0,0 @@
-meta {
-  name: 2fa-enable
-  type: http
-  seq: 4
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/2fa/enable
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "code": "374138"
-  }
-}
diff --git a/bruno/Auth/2fa-request.bru b/bruno/Auth/2fa-request.bru
deleted file mode 100644
index fcf0c9862..000000000
--- a/bruno/Auth/2fa-request.bru
+++ /dev/null
@@ -1,17 +0,0 @@
-meta {
-  name: 2fa-request
-  type: http
-  seq: 5
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/2fa/request
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "password": "aaaaa-1A"
-  }
-}
diff --git a/bruno/Auth/change-password.bru b/bruno/Auth/change-password.bru
deleted file mode 100644
index 7d1c707e5..000000000
--- a/bruno/Auth/change-password.bru
+++ /dev/null
@@ -1,18 +0,0 @@
-meta {
-  name: change-password
-  type: http
-  seq: 9
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/change-password
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "oldPassword": "",
-      "newPassword": ""
-  }
-}
diff --git a/bruno/Auth/login.bru b/bruno/Auth/login.bru
deleted file mode 100644
index 3825a2525..000000000
--- a/bruno/Auth/login.bru
+++ /dev/null
@@ -1,18 +0,0 @@
-meta {
-  name: login
-  type: http
-  seq: 1
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/login
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-    "email": "admin@fosrl.io",
-    "password": "Password123!"
-  }
-}
diff --git a/bruno/Auth/logout.bru b/bruno/Auth/logout.bru
deleted file mode 100644
index 623cd47fe..000000000
--- a/bruno/Auth/logout.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: logout
-  type: http
-  seq: 3
-}
-
-post {
-  url: http://localhost:4000/api/v1/auth/logout
-  body: none
-  auth: none
-}
diff --git a/bruno/Auth/reset-password-request.bru b/bruno/Auth/reset-password-request.bru
deleted file mode 100644
index 29c3b89d1..000000000
--- a/bruno/Auth/reset-password-request.bru
+++ /dev/null
@@ -1,17 +0,0 @@
-meta {
-  name: reset-password-request
-  type: http
-  seq: 10
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/reset-password/request
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "email": "milo@pangolin.net"
-  }
-}
diff --git a/bruno/Auth/reset-password.bru b/bruno/Auth/reset-password.bru
deleted file mode 100644
index 8d567b164..000000000
--- a/bruno/Auth/reset-password.bru
+++ /dev/null
@@ -1,19 +0,0 @@
-meta {
-  name: reset-password
-  type: http
-  seq: 11
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/reset-password
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "token": "3uhsbom72dwdhboctwrtntyd6jrlg4jtf5oaxy4k",
-      "newPassword": "aaaaa-1A",
-      "code": "6irqCGR3"
-  }
-}
diff --git a/bruno/Auth/signup.bru b/bruno/Auth/signup.bru
deleted file mode 100644
index bec59235e..000000000
--- a/bruno/Auth/signup.bru
+++ /dev/null
@@ -1,18 +0,0 @@
-meta {
-  name: signup
-  type: http
-  seq: 2
-}
-
-put {
-  url: http://localhost:3000/api/v1/auth/signup
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-    "email": "numbat@pangolin.net",
-    "password": "Password123!"
-  }
-}
diff --git a/bruno/Auth/verify-email-request.bru b/bruno/Auth/verify-email-request.bru
deleted file mode 100644
index 72189d1b2..000000000
--- a/bruno/Auth/verify-email-request.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: verify-email-request
-  type: http
-  seq: 8
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/verify-email/request
-  body: none
-  auth: none
-}
diff --git a/bruno/Auth/verify-email.bru b/bruno/Auth/verify-email.bru
deleted file mode 100644
index a06a7108c..000000000
--- a/bruno/Auth/verify-email.bru
+++ /dev/null
@@ -1,17 +0,0 @@
-meta {
-  name: verify-email
-  type: http
-  seq: 7
-}
-
-post {
-  url: http://localhost:3000/api/v1/auth/verify-email
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "code": "50317187"
-  }
-}
diff --git a/bruno/Auth/verify-user.bru b/bruno/Auth/verify-user.bru
deleted file mode 100644
index 38955449d..000000000
--- a/bruno/Auth/verify-user.bru
+++ /dev/null
@@ -1,15 +0,0 @@
-meta {
-  name: verify-user
-  type: http
-  seq: 4
-}
-
-get {
-  url: http://localhost:3001/api/v1/badger/verify-user?sessionId=mb52273jkb6t3oys2bx6ur5x7rcrkl26c7warg3e
-  body: none
-  auth: none
-}
-
-params:query {
-  sessionId: mb52273jkb6t3oys2bx6ur5x7rcrkl26c7warg3e
-}
diff --git a/bruno/Clients/createClient.bru b/bruno/Clients/createClient.bru
deleted file mode 100644
index 7577bb280..000000000
--- a/bruno/Clients/createClient.bru
+++ /dev/null
@@ -1,22 +0,0 @@
-meta {
-  name: createClient
-  type: http
-  seq: 1
-}
-
-put {
-  url: http://localhost:3000/api/v1/site/1/client
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-      "siteId": 1,
-      "name": "test",
-      "type": "olm",
-      "subnet": "100.90.129.4/30",
-      "olmId": "029yzunhx6nh3y5",
-      "secret": "l0ymp075y3d4rccb25l6sqpgar52k09etunui970qq5gj7x6"
-  }
-}
diff --git a/bruno/Clients/pickClientDefaults.bru b/bruno/Clients/pickClientDefaults.bru
deleted file mode 100644
index 61509c112..000000000
--- a/bruno/Clients/pickClientDefaults.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: pickClientDefaults
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1/site/1/pick-client-defaults
-  body: none
-  auth: none
-}
diff --git a/bruno/IDP/Create OIDC Provider.bru b/bruno/IDP/Create OIDC Provider.bru
deleted file mode 100644
index 23e807cf9..000000000
--- a/bruno/IDP/Create OIDC Provider.bru	
+++ /dev/null
@@ -1,22 +0,0 @@
-meta {
-  name: Create OIDC Provider
-  type: http
-  seq: 1
-}
-
-put {
-  url: http://localhost:3000/api/v1/org/home-lab/idp/oidc
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "clientId": "JJoSvHCZcxnXT2sn6CObj6a21MuKNRXs3kN5wbys",
-    "clientSecret": "2SlGL2wOGgMEWLI9yUuMAeFxre7qSNJVnXMzyepdNzH1qlxYnC4lKhhQ6a157YQEkYH3vm40KK4RCqbYiF8QIweuPGagPX3oGxEj2exwutoXFfOhtq4hHybQKoFq01Z3",
-    "authUrl": "http://localhost:9000/application/o/authorize/",
-    "tokenUrl": "http://localhost:9000/application/o/token/",
-    "scopes": ["email", "openid", "profile"],
-    "userIdentifier": "email"
-  }
-}
diff --git a/bruno/IDP/Generate OIDC URL.bru b/bruno/IDP/Generate OIDC URL.bru
deleted file mode 100644
index 90443096f..000000000
--- a/bruno/IDP/Generate OIDC URL.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: Generate OIDC URL
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1
-  body: none
-  auth: inherit
-}
diff --git a/bruno/IDP/folder.bru b/bruno/IDP/folder.bru
deleted file mode 100644
index fc1369159..000000000
--- a/bruno/IDP/folder.bru
+++ /dev/null
@@ -1,3 +0,0 @@
-meta {
-  name: IDP
-}
diff --git a/bruno/Internal/Traefik Config.bru b/bruno/Internal/Traefik Config.bru
deleted file mode 100644
index 9fc1c1dcb..000000000
--- a/bruno/Internal/Traefik Config.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: Traefik Config
-  type: http
-  seq: 1
-}
-
-get {
-  url: http://localhost:3001/api/v1/traefik-config
-  body: none
-  auth: inherit
-}
diff --git a/bruno/Internal/folder.bru b/bruno/Internal/folder.bru
deleted file mode 100644
index 702931ec4..000000000
--- a/bruno/Internal/folder.bru
+++ /dev/null
@@ -1,3 +0,0 @@
-meta {
-  name: Internal
-}
diff --git a/bruno/Newt/Create Newt.bru b/bruno/Newt/Create Newt.bru
deleted file mode 100644
index 56baf89bd..000000000
--- a/bruno/Newt/Create Newt.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: Create Newt
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1/newt
-  body: none
-  auth: none
-}
diff --git a/bruno/Newt/Get Token.bru b/bruno/Newt/Get Token.bru
deleted file mode 100644
index 93d91cc5d..000000000
--- a/bruno/Newt/Get Token.bru	
+++ /dev/null
@@ -1,18 +0,0 @@
-meta {
-  name: Get Token
-  type: http
-  seq: 1
-}
-
-get {
-  url: http://localhost:3000/api/v1/auth/newt/get-token
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-   "newtId": "o0d4rdxq3stnz7b",
-    "secret": "sy7l09fnaesd03iwrfp9m3qf0ryn19g0zf3dqieaazb4k7vk"
-  }
-}
diff --git a/bruno/Olm/createOlm.bru b/bruno/Olm/createOlm.bru
deleted file mode 100644
index ca755dea8..000000000
--- a/bruno/Olm/createOlm.bru
+++ /dev/null
@@ -1,15 +0,0 @@
-meta {
-  name: createOlm
-  type: http
-  seq: 1
-}
-
-put {
-  url: http://localhost:3000/api/v1/olm
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-}
diff --git a/bruno/Olm/folder.bru b/bruno/Olm/folder.bru
deleted file mode 100644
index d245e6d1c..000000000
--- a/bruno/Olm/folder.bru
+++ /dev/null
@@ -1,8 +0,0 @@
-meta {
-  name: Olm
-  seq: 15
-}
-
-auth {
-  mode: inherit
-}
diff --git a/bruno/Orgs/Check Id.bru b/bruno/Orgs/Check Id.bru
deleted file mode 100644
index 17b63953c..000000000
--- a/bruno/Orgs/Check Id.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: Check Id
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1/org/checkId
-  body: none
-  auth: none
-}
diff --git a/bruno/Orgs/listOrgs.bru b/bruno/Orgs/listOrgs.bru
deleted file mode 100644
index 89c34d0cb..000000000
--- a/bruno/Orgs/listOrgs.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: listOrgs
-  type: http
-  seq: 1
-}
-
-get {
-  url: 
-  body: none
-  auth: none
-}
diff --git a/bruno/Remote Exit Node/createRemoteExitNode.bru b/bruno/Remote Exit Node/createRemoteExitNode.bru
deleted file mode 100644
index 1c749a311..000000000
--- a/bruno/Remote Exit Node/createRemoteExitNode.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: createRemoteExitNode
-  type: http
-  seq: 1
-}
-
-put {
-  url: http://localhost:4000/api/v1/org/org_i21aifypnlyxur2/remote-exit-node
-  body: none
-  auth: none
-}
diff --git a/bruno/Resources/listResourcesByOrg.bru b/bruno/Resources/listResourcesByOrg.bru
deleted file mode 100644
index 6efce1b20..000000000
--- a/bruno/Resources/listResourcesByOrg.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: listResourcesByOrg
-  type: http
-  seq: 1
-}
-
-get {
-  url: 
-  body: none
-  auth: none
-}
diff --git a/bruno/Resources/listResourcesBySite.bru b/bruno/Resources/listResourcesBySite.bru
deleted file mode 100644
index 81c9cf99b..000000000
--- a/bruno/Resources/listResourcesBySite.bru
+++ /dev/null
@@ -1,16 +0,0 @@
-meta {
-  name: listResourcesBySite
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1/site/1/resources?limit=10&offset=0
-  body: none
-  auth: none
-}
-
-params:query {
-  limit: 10
-  offset: 0
-}
diff --git a/bruno/Sites/Get Site.bru b/bruno/Sites/Get Site.bru
deleted file mode 100644
index fc2f7e62b..000000000
--- a/bruno/Sites/Get Site.bru	
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: Get Site
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1/org/test/sites/mexican-mole-lizard-windy
-  body: none
-  auth: none
-}
diff --git a/bruno/Sites/listSites.bru b/bruno/Sites/listSites.bru
deleted file mode 100644
index b7912330a..000000000
--- a/bruno/Sites/listSites.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: listSites
-  type: http
-  seq: 1
-}
-
-get {
-  url: 
-  body: none
-  auth: none
-}
diff --git a/bruno/Targets/listTargets.bru b/bruno/Targets/listTargets.bru
deleted file mode 100644
index 7981eb453..000000000
--- a/bruno/Targets/listTargets.bru
+++ /dev/null
@@ -1,16 +0,0 @@
-meta {
-  name: listTargets
-  type: http
-  seq: 1
-}
-
-get {
-  url: http://localhost:3000/api/v1/resource/web.main.localhost/targets?limit=10&offset=0
-  body: none
-  auth: none
-}
-
-params:query {
-  limit: 10
-  offset: 0
-}
diff --git a/bruno/Test.bru b/bruno/Test.bru
deleted file mode 100644
index 16286ec8c..000000000
--- a/bruno/Test.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: Test
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1
-  body: none
-  auth: inherit
-}
diff --git a/bruno/Traefik/traefik-config.bru b/bruno/Traefik/traefik-config.bru
deleted file mode 100644
index a50b7aa15..000000000
--- a/bruno/Traefik/traefik-config.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: traefik-config
-  type: http
-  seq: 1
-}
-
-get {
-  url: http://localhost:3001/api/v1/traefik-config
-  body: none
-  auth: none
-}
diff --git a/bruno/Users/adminListUsers.bru b/bruno/Users/adminListUsers.bru
deleted file mode 100644
index cdc410956..000000000
--- a/bruno/Users/adminListUsers.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: adminListUsers
-  type: http
-  seq: 2
-}
-
-get {
-  url: http://localhost:3000/api/v1/users
-  body: none
-  auth: none
-}
diff --git a/bruno/Users/adminRemoveUser.bru b/bruno/Users/adminRemoveUser.bru
deleted file mode 100644
index 9e9f35079..000000000
--- a/bruno/Users/adminRemoveUser.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: adminRemoveUser
-  type: http
-  seq: 3
-}
-
-delete {
-  url: http://localhost:3000/api/v1/user/ky5r7ivqs8wc7u4
-  body: none
-  auth: none
-}
diff --git a/bruno/Users/getUser.bru b/bruno/Users/getUser.bru
deleted file mode 100644
index d86372527..000000000
--- a/bruno/Users/getUser.bru
+++ /dev/null
@@ -1,11 +0,0 @@
-meta {
-  name: getUser
-  type: http
-  seq: 1
-}
-
-get {
-  url: 
-  body: none
-  auth: none
-}
diff --git a/bruno/bruno.json b/bruno/bruno.json
deleted file mode 100644
index f19d936a8..000000000
--- a/bruno/bruno.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "version": "1",
-  "name": "Pangolin",
-  "type": "collection",
-  "ignore": [
-    "node_modules",
-    ".git"
-  ],
-  "presets": {
-    "requestType": "http",
-    "requestUrl": "http://localhost:3000/api/v1"
-  }
-}
\ No newline at end of file
diff --git a/src/components/AlertingRulesTable.tsx b/src/components/AlertingRulesTable.tsx
index dcb0bfe79..1b34ae2bd 100644
--- a/src/components/AlertingRulesTable.tsx
+++ b/src/components/AlertingRulesTable.tsx
@@ -24,6 +24,8 @@ import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
+import type { PaginationState } from "@tanstack/react-table";
+import type { DataTablePaginationState } from "@app/components/ui/data-table";
 
 type AlertingRulesTableProps = {
     orgId: string;
@@ -106,16 +108,39 @@ export default function AlertingRulesTable({ orgId }: AlertingRulesTableProps) {
     const [deleteOpen, setDeleteOpen] = useState(false);
     const [selected, setSelected] = useState<AlertRuleRow | null>(null);
     const [togglingId, setTogglingId] = useState<number | null>(null);
+    const [pageIndex, setPageIndex] = useState(0);
+    const [pageSize, setPageSize] = useState(() => {
+        if (typeof window === "undefined") return 20;
+        try {
+            const stored = localStorage.getItem("Org-alerting-rules-table-size");
+            if (stored) {
+                const parsed = parseInt(stored, 10);
+                if (parsed > 0 && parsed <= 1000) return parsed;
+            }
+        } catch {}
+        return 20;
+    });
 
     const {
-        data: rows = [],
+        data,
         isLoading,
         refetch,
         isRefetching
-    } = useQuery(orgQueries.alertRules({ orgId }));
+    } = useQuery(orgQueries.alertRules({ orgId, limit: pageSize, offset: pageIndex * pageSize }));
+
+    const rows = data?.alertRules ?? [];
+    const total = data?.pagination.total ?? 0;
+    const pageCount = Math.max(1, Math.ceil(total / pageSize));
+
+    const paginationState: DataTablePaginationState = { pageIndex, pageSize, pageCount };
+
+    const handlePaginationChange = (newState: PaginationState) => {
+        setPageIndex(newState.pageIndex);
+        setPageSize(newState.pageSize);
+    };
 
     const invalidate = () =>
-        queryClient.invalidateQueries(orgQueries.alertRules({ orgId }));
+        queryClient.invalidateQueries({ queryKey: ["ORG", orgId, "ALERT_RULES"] });
 
     const setEnabled = async (rule: AlertRuleRow, enabled: boolean) => {
         setTogglingId(rule.alertRuleId);
@@ -296,6 +321,8 @@ export default function AlertingRulesTable({ orgId }: AlertingRulesTableProps) {
                 enableColumnVisibility
                 stickyLeftColumn="name"
                 stickyRightColumn="rowActions"
+                pagination={paginationState}
+                onPaginationChange={handlePaginationChange}
             />
         </>
     );
diff --git a/src/components/HealthChecksTable.tsx b/src/components/HealthChecksTable.tsx
index a09af2da1..a63585532 100644
--- a/src/components/HealthChecksTable.tsx
+++ b/src/components/HealthChecksTable.tsx
@@ -24,6 +24,8 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { ArrowUpDown, ArrowUpRight, MoreHorizontal } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
+import type { PaginationState } from "@tanstack/react-table";
+import type { DataTablePaginationState } from "@app/components/ui/data-table";
 import Link from "next/link";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
@@ -75,21 +77,54 @@ export default function HealthChecksTable({
     const [deleteOpen, setDeleteOpen] = useState(false);
     const [selected, setSelected] = useState<HealthCheckRow | null>(null);
     const [togglingId, setTogglingId] = useState<number | null>(null);
+    const [pageIndex, setPageIndex] = useState(0);
+    const [pageSize, setPageSize] = useState(() => {
+        if (typeof window === "undefined") return 20;
+        try {
+            const stored = localStorage.getItem(
+                "Org-standalone-health-checks-table-size"
+            );
+            if (stored) {
+                const parsed = parseInt(stored, 10);
+                if (parsed > 0 && parsed <= 1000) return parsed;
+            }
+        } catch {}
+        return 20;
+    });
 
     const {
-        data: rows = [],
+        data,
         isLoading,
         refetch,
         isRefetching
     } = useQuery({
-        ...orgQueries.standaloneHealthChecks({ orgId }),
+        ...orgQueries.standaloneHealthChecks({
+            orgId,
+            limit: pageSize,
+            offset: pageIndex * pageSize
+        }),
         refetchInterval: 10_000
     });
 
+    const rows = data?.healthChecks ?? [];
+    const total = data?.pagination.total ?? 0;
+    const pageCount = Math.max(1, Math.ceil(total / pageSize));
+
+    const paginationState: DataTablePaginationState = {
+        pageIndex,
+        pageSize,
+        pageCount
+    };
+
+    const handlePaginationChange = (newState: PaginationState) => {
+        setPageIndex(newState.pageIndex);
+        setPageSize(newState.pageSize);
+    };
+
     const invalidate = () =>
-        queryClient.invalidateQueries(
-            orgQueries.standaloneHealthChecks({ orgId })
-        );
+        queryClient.invalidateQueries({
+            queryKey: ["ORG", orgId, "STANDALONE_HEALTH_CHECKS"]
+        });
 
     const handleToggleEnabled = async (
         row: HealthCheckRow,
@@ -356,6 +391,8 @@ export default function HealthChecksTable({
                 enableColumnVisibility
                 stickyLeftColumn="name"
                 stickyRightColumn="rowActions"
+                pagination={paginationState}
+                onPaginationChange={handlePaginationChange}
             />
         </>
     );
diff --git a/src/lib/queries.ts b/src/lib/queries.ts
index 25f96602d..45e62b515 100644
--- a/src/lib/queries.ts
+++ b/src/lib/queries.ts
@@ -256,14 +256,25 @@ export const orgQueries = {
             }
         }),
 
-    alertRules: ({ orgId }: { orgId: string }) =>
+    alertRules: ({
+        orgId,
+        limit = 20,
+        offset = 0
+    }: {
+        orgId: string;
+        limit?: number;
+        offset?: number;
+    }) =>
         queryOptions({
-            queryKey: ["ORG", orgId, "ALERT_RULES"] as const,
+            queryKey: ["ORG", orgId, "ALERT_RULES", { limit, offset }] as const,
             queryFn: async ({ signal, meta }) => {
                 const res = await meta!.api.get<
                     AxiosResponse<ListAlertRulesResponse>
-                >(`/org/${orgId}/alert-rules`, { signal });
-                return res.data.data.alertRules;
+                >(`/org/${orgId}/alert-rules?limit=${limit}&offset=${offset}`, { signal });
+                return {
+                    alertRules: res.data.data.alertRules,
+                    pagination: res.data.data.pagination
+                };
             }
         }),
 
@@ -289,9 +300,17 @@ export const orgQueries = {
             }
         }),
 
-    standaloneHealthChecks: ({ orgId }: { orgId: string }) =>
+    standaloneHealthChecks: ({
+        orgId,
+        limit = 20,
+        offset = 0
+    }: {
+        orgId: string;
+        limit?: number;
+        offset?: number;
+    }) =>
         queryOptions({
-            queryKey: ["ORG", orgId, "STANDALONE_HEALTH_CHECKS"] as const,
+            queryKey: ["ORG", orgId, "STANDALONE_HEALTH_CHECKS", { limit, offset }] as const,
             queryFn: async ({ signal, meta }) => {
                 const res = await meta!.api.get<
                     AxiosResponse<{
@@ -325,8 +344,11 @@ export const orgQueries = {
                             offset: number;
                         };
                     }>
-                >(`/org/${orgId}/health-checks`, { signal });
-                return res.data.data.healthChecks;
+                >(`/org/${orgId}/health-checks?limit=${limit}&offset=${offset}`, { signal });
+                return {
+                    healthChecks: res.data.data.healthChecks,
+                    pagination: res.data.data.pagination
+                };
             }
         }),
     siteStatusHistory: ({