diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 38d1a74ec8..d716722e3b 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -23,10 +23,27 @@
       "Bash(git commit:*)",
       "Bash(git push:*)",
       "Bash(npx vitest run:*)",
+      "Bash(cp /Users/harsh/Data/vw/verifywise/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts /tmp/annex.bak.ts)",
+      "Bash(cp /Users/harsh/Data/vw/verifywise/Servers/structures/ISO-27001/clauses/iso27001.clause.struct.ts /tmp/clause.bak.ts)",
+      "Bash(node /tmp/apply-iso27001-content.js)",
+      "Bash(node /tmp/rename-iso27001-titles.js)",
+      "Bash(awk 'NR>=3200 && NR<=3260' /Users/harsh/Data/vw/verifywise/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts)",
+      "Bash(awk '/^        \\\\],$/ && prev ~ /^        \\\\],$/ { print NR\": stray at line \"NR; } { prev = $0 }' /Users/harsh/Data/vw/verifywise/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts)",
+      "Bash(awk 'BEGIN{ prev=\"\" } *)",
+      "Bash(awk '/^        \\\\],$/ && prev ~ /^        \\\\],$/ { c++ } { prev = $0 } END { print c+0 }' /Users/harsh/Data/vw/verifywise/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts)",
+      "Bash(awk *)",
       "Bash(cmd.exe /c \"where gh\")",
       "Bash(curl:*)",
       "WebFetch(domain:api.github.com)",
       "Bash(git status:*)",
+      "Bash(node -c database/migrations/20260417150653-reseed-eu-act-struct-with-metadata.js)",
+      "Bash(node -c database/migrations/20260420105041-iso42001-split-clause-6-1.js)",
+      "Bash(node -c database/migrations/20260420105042-iso42001-add-clause-6-3.js)",
+      "Bash(PGPASSWORD=test psql *)",
+      "Bash(lsof *)",
+      "Bash(node *)",
+      "Bash(npx sequelize *)",
+      "Bash(psql -h localhost -p 5433 -U postgres -d vwtest4 -c ' *)",
       "Bash(node -e:*)",
       "Bash(test:*)",
       "Bash(npx ts-node:*)",
@@ -37,7 +54,10 @@
       "Bash(kill:*)",
       "Bash(wait:*)",
       "WebSearch",
-      "Bash(git --version)"
+      "Bash(git --version)",
+      "Bash(npm run *)",
+      "Bash(grep \"error TS\" /tmp/buildout.txt)",
+      "Bash(npm install *)"
     ]
   }
 }
diff --git a/Clients/src/application/mappers/project.mapper.ts b/Clients/src/application/mappers/project.mapper.ts
index 287b1b4a59..a4e7a203b6 100644
--- a/Clients/src/application/mappers/project.mapper.ts
+++ b/Clients/src/application/mappers/project.mapper.ts
@@ -46,27 +46,14 @@ export function mapRiskClassification(
  */
 export function mapHighRiskRole(value: number | string): HighRiskRole {
   if (typeof value === "number") {
-    // Map numeric values to enum (assuming 0-5 mapping)
-    const numericMapping: Record<number, HighRiskRole> = {
-      0: HighRiskRole.DEPLOYER,
-      1: HighRiskRole.PROVIDER,
-      2: HighRiskRole.DISTRIBUTOR,
-      3: HighRiskRole.IMPORTER,
-      4: HighRiskRole.PRODUCT_MANUFACTURER,
-      5: HighRiskRole.AUTHORIZED_REPRESENTATIVE,
-    };
-    return numericMapping[value] || HighRiskRole.DEPLOYER;
+    return value === 1 ? HighRiskRole.PROVIDER : HighRiskRole.DEPLOYER;
   }
-  // Map string values to enum
-  const mapping: Record<string, HighRiskRole> = {
-    "deployer": HighRiskRole.DEPLOYER,
-    "provider": HighRiskRole.PROVIDER,
-    "distributor": HighRiskRole.DISTRIBUTOR,
-    "importer": HighRiskRole.IMPORTER,
-    "product manufacturer": HighRiskRole.PRODUCT_MANUFACTURER,
-    "authorized representative": HighRiskRole.AUTHORIZED_REPRESENTATIVE,
-  };
-  return mapping[value.toLowerCase()] || HighRiskRole.DEPLOYER;
+  // Legacy values (Distributor, Importer, Product manufacturer,
+  // Authorized representative) collapse onto Provider; not_applicable onto
+  // Deployer — matches the DB migration's remap.
+  const v = value.toLowerCase();
+  if (v === "deployer" || v === "not_applicable") return HighRiskRole.DEPLOYER;
+  return HighRiskRole.PROVIDER;
 }
 
 /**
diff --git a/Clients/src/application/mappers/tests/project.mappers.test.ts b/Clients/src/application/mappers/tests/project.mappers.test.ts
index 213cc2e9cd..ff5561fb7f 100644
--- a/Clients/src/application/mappers/tests/project.mappers.test.ts
+++ b/Clients/src/application/mappers/tests/project.mappers.test.ts
@@ -54,36 +54,31 @@ describe("Test project mappers functions", () => {
       expect(result).toBe(HighRiskRole.DEPLOYER);
       result = mapHighRiskRole(1);
       expect(result).toBe(HighRiskRole.PROVIDER);
-      result = mapHighRiskRole(2);
-      expect(result).toBe(HighRiskRole.DISTRIBUTOR);
-      result = mapHighRiskRole(3);
-      expect(result).toBe(HighRiskRole.IMPORTER);
-      result = mapHighRiskRole(4);
-      expect(result).toBe(HighRiskRole.PRODUCT_MANUFACTURER);
-      result = mapHighRiskRole(5);
-      expect(result).toBe(HighRiskRole.AUTHORIZED_REPRESENTATIVE);
     });
     it("should receive a valid string and return the mapped value", () => {
       let result = mapHighRiskRole("Deployer");
       expect(result).toBe(HighRiskRole.DEPLOYER);
       result = mapHighRiskRole("Provider");
       expect(result).toBe(HighRiskRole.PROVIDER);
-      result = mapHighRiskRole("Distributor");
-      expect(result).toBe(HighRiskRole.DISTRIBUTOR);
-      result = mapHighRiskRole("Importer");
-      expect(result).toBe(HighRiskRole.IMPORTER);
-      result = mapHighRiskRole("Product Manufacturer");
-      expect(result).toBe(HighRiskRole.PRODUCT_MANUFACTURER);
-      result = mapHighRiskRole("Authorized Representative");
-      expect(result).toBe(HighRiskRole.AUTHORIZED_REPRESENTATIVE);
     });
-    it("should receive an invalid number and return the default value", () => {
+    it("should collapse legacy provider-tier strings onto PROVIDER", () => {
+      // Pre-reduction values (Distributor/Importer/Product manufacturer/
+      // Authorized representative) now map to Provider.
+      expect(mapHighRiskRole("Distributor")).toBe(HighRiskRole.PROVIDER);
+      expect(mapHighRiskRole("Importer")).toBe(HighRiskRole.PROVIDER);
+      expect(mapHighRiskRole("Product Manufacturer")).toBe(HighRiskRole.PROVIDER);
+      expect(mapHighRiskRole("Authorized Representative")).toBe(HighRiskRole.PROVIDER);
+    });
+    it("should collapse legacy 'not_applicable' onto DEPLOYER", () => {
+      expect(mapHighRiskRole("not_applicable")).toBe(HighRiskRole.DEPLOYER);
+    });
+    it("should receive an invalid number and return PROVIDER (non-zero fallback)", () => {
       const result = mapHighRiskRole(99);
-      expect(result).toBe(HighRiskRole.DEPLOYER);
+      expect(result).toBe(HighRiskRole.PROVIDER);
     });
-    it("should receive an invalid string and return the default value", () => {
+    it("should receive an invalid string and return PROVIDER (non-matching fallback)", () => {
       const result = mapHighRiskRole("InvalidString");
-      expect(result).toBe(HighRiskRole.DEPLOYER);
+      expect(result).toBe(HighRiskRole.PROVIDER);
     });
   });
   describe("mapProjectResponseDTOToProject", () => {
diff --git a/Clients/src/application/utils/lazyRoute.tsx b/Clients/src/application/utils/lazyRoute.tsx
index 7ae90eefcb..3b43e256bd 100644
--- a/Clients/src/application/utils/lazyRoute.tsx
+++ b/Clients/src/application/utils/lazyRoute.tsx
@@ -19,13 +19,13 @@ export const LazyFallback = () => (
  * Wraps React.lazy() with retry logic for chunk load failures.
  * Retries up to 3 times with exponential backoff (1.5s, 3s, 6s).
  */
-export function lazyRoute<T extends ComponentType<unknown>>(
+export function lazyRoute<T extends ComponentType<any>>(
   factory: () => Promise<{ default: T }>
 ) {
   return lazy(() => retryImport(factory));
 }
 
-function retryImport<T extends ComponentType<unknown>>(
+function retryImport<T extends ComponentType<any>>(
   factory: () => Promise<{ default: T }>,
   retries = 3,
   delay = 1500
diff --git a/Clients/src/domain/enums/aiRiskClassification.enum.ts b/Clients/src/domain/enums/aiRiskClassification.enum.ts
index 1d2420409c..1e4e34f76f 100644
--- a/Clients/src/domain/enums/aiRiskClassification.enum.ts
+++ b/Clients/src/domain/enums/aiRiskClassification.enum.ts
@@ -3,4 +3,6 @@ export enum AiRiskClassification {
   HIGH_RISK = "High risk",
   LIMITED_RISK = "Limited risk",
   MINIMAL_RISK = "Minimal risk",
+  GPAI = "GPAI",
+  GENERAL_RISK = "General Risk",
 }
diff --git a/Clients/src/domain/enums/highRiskRole.enum.ts b/Clients/src/domain/enums/highRiskRole.enum.ts
index 870b8050fd..e120e51a89 100644
--- a/Clients/src/domain/enums/highRiskRole.enum.ts
+++ b/Clients/src/domain/enums/highRiskRole.enum.ts
@@ -1,8 +1,4 @@
 export enum HighRiskRole {
   DEPLOYER = "Deployer",
   PROVIDER = "Provider",
-  DISTRIBUTOR = "Distributor",
-  IMPORTER = "Importer",
-  PRODUCT_MANUFACTURER = "Product manufacturer",
-  AUTHORIZED_REPRESENTATIVE = "Authorized representative",
 }
diff --git a/Clients/src/infrastructure/api/__tests__/automationsService.test.ts b/Clients/src/infrastructure/api/__tests__/automationsService.test.ts
index 71050e24d5..67c628096a 100644
--- a/Clients/src/infrastructure/api/__tests__/automationsService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/automationsService.test.ts
@@ -12,7 +12,7 @@ vi.mock("../customAxios", () => ({
 import { automationsService } from "../automationsService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("automationsService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/biasAuditService.test.ts b/Clients/src/infrastructure/api/__tests__/biasAuditService.test.ts
index 80d624a6bb..318a59c10f 100644
--- a/Clients/src/infrastructure/api/__tests__/biasAuditService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/biasAuditService.test.ts
@@ -12,7 +12,7 @@ vi.mock("../customAxios", () => ({
 import { biasAuditService } from "../biasAuditService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("biasAuditService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/ceMarkingService.test.ts b/Clients/src/infrastructure/api/__tests__/ceMarkingService.test.ts
index 9939d07081..4c956856e4 100644
--- a/Clients/src/infrastructure/api/__tests__/ceMarkingService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/ceMarkingService.test.ts
@@ -10,7 +10,7 @@ vi.mock("../customAxios", () => ({
 import { ceMarkingService } from "../ceMarkingService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("ceMarkingService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/deepEvalArenaService.test.ts b/Clients/src/infrastructure/api/__tests__/deepEvalArenaService.test.ts
index b71a633146..574b5dba32 100644
--- a/Clients/src/infrastructure/api/__tests__/deepEvalArenaService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/deepEvalArenaService.test.ts
@@ -11,7 +11,7 @@ vi.mock("../customAxios", () => ({
 import { deepEvalArenaService } from "../deepEvalArenaService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("deepEvalArenaService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/deepEvalDatasetsService.test.ts b/Clients/src/infrastructure/api/__tests__/deepEvalDatasetsService.test.ts
index 6320b88d4a..32fc56bc96 100644
--- a/Clients/src/infrastructure/api/__tests__/deepEvalDatasetsService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/deepEvalDatasetsService.test.ts
@@ -19,7 +19,7 @@ vi.mock("../deepEvalOrgsService", () => ({
 import { deepEvalDatasetsService } from "../deepEvalDatasetsService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("deepEvalDatasetsService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/deepEvalOrgsService.test.ts b/Clients/src/infrastructure/api/__tests__/deepEvalOrgsService.test.ts
index ccf3640f4b..af49b51d8e 100644
--- a/Clients/src/infrastructure/api/__tests__/deepEvalOrgsService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/deepEvalOrgsService.test.ts
@@ -12,7 +12,7 @@ vi.mock("../customAxios", () => ({
 import { deepEvalOrgsService } from "../deepEvalOrgsService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("deepEvalOrgsService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/deepEvalProjectsService.test.ts b/Clients/src/infrastructure/api/__tests__/deepEvalProjectsService.test.ts
index ecd065d927..421b93a3ac 100644
--- a/Clients/src/infrastructure/api/__tests__/deepEvalProjectsService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/deepEvalProjectsService.test.ts
@@ -12,7 +12,7 @@ vi.mock("../customAxios", () => ({
 import { deepEvalProjectsService } from "../deepEvalProjectsService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("deepEvalProjectsService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/deepEvalScorersService.test.ts b/Clients/src/infrastructure/api/__tests__/deepEvalScorersService.test.ts
index da168ecd96..6a62c2d343 100644
--- a/Clients/src/infrastructure/api/__tests__/deepEvalScorersService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/deepEvalScorersService.test.ts
@@ -20,7 +20,7 @@ vi.mock("../deepEvalOrgsService", () => ({
 import { deepEvalScorersService } from "../deepEvalScorersService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("deepEvalScorersService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/evalModelsService.test.ts b/Clients/src/infrastructure/api/__tests__/evalModelsService.test.ts
index b627a7be6e..32715fc1d6 100644
--- a/Clients/src/infrastructure/api/__tests__/evalModelsService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/evalModelsService.test.ts
@@ -12,7 +12,7 @@ vi.mock("../customAxios", () => ({
 import { evalModelsService } from "../evalModelsService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("evalModelsService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/evaluationLlmApiKeysService.test.ts b/Clients/src/infrastructure/api/__tests__/evaluationLlmApiKeysService.test.ts
index 37b5a64f67..f478111bdd 100644
--- a/Clients/src/infrastructure/api/__tests__/evaluationLlmApiKeysService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/evaluationLlmApiKeysService.test.ts
@@ -11,7 +11,7 @@ vi.mock("../customAxios", () => ({
 import { evaluationLlmApiKeysService } from "../evaluationLlmApiKeysService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("evaluationLlmApiKeysService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/evaluationLogsService.test.ts b/Clients/src/infrastructure/api/__tests__/evaluationLogsService.test.ts
index 7cd29ac721..4a1903ae12 100644
--- a/Clients/src/infrastructure/api/__tests__/evaluationLogsService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/evaluationLogsService.test.ts
@@ -19,7 +19,7 @@ import {
 } from "../evaluationLogsService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("evaluationLogsService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/networkServices.test.ts b/Clients/src/infrastructure/api/__tests__/networkServices.test.ts
index 2f368483c3..3ebd3d7a90 100644
--- a/Clients/src/infrastructure/api/__tests__/networkServices.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/networkServices.test.ts
@@ -23,7 +23,7 @@ vi.mock("axios", () => {
 import { apiServices } from "../networkServices";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("apiServices", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/postMarketMonitoringService.test.ts b/Clients/src/infrastructure/api/__tests__/postMarketMonitoringService.test.ts
index 506f3daa33..339b11b0df 100644
--- a/Clients/src/infrastructure/api/__tests__/postMarketMonitoringService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/postMarketMonitoringService.test.ts
@@ -32,7 +32,7 @@ import {
 } from "../postMarketMonitoringService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("postMarketMonitoringService", () => {
   beforeEach(() => {
diff --git a/Clients/src/infrastructure/api/__tests__/searchService.test.ts b/Clients/src/infrastructure/api/__tests__/searchService.test.ts
index 46fe75c67d..77dd645609 100644
--- a/Clients/src/infrastructure/api/__tests__/searchService.test.ts
+++ b/Clients/src/infrastructure/api/__tests__/searchService.test.ts
@@ -9,7 +9,7 @@ vi.mock("../customAxios", () => ({
 import { wiseSearch, getEntityDisplayName, ENTITY_DISPLAY_NAMES } from "../searchService";
 import CustomAxios from "../customAxios";
 
-const mockAxios = vi.mocked(CustomAxios);
+const mockAxios = vi.mocked(CustomAxios, { deep: true });
 
 describe("searchService", () => {
   beforeEach(() => {
diff --git a/Clients/src/presentation/components/AddNewRiskForm/index.tsx b/Clients/src/presentation/components/AddNewRiskForm/index.tsx
index da6241edf8..5c459019c4 100644
--- a/Clients/src/presentation/components/AddNewRiskForm/index.tsx
+++ b/Clients/src/presentation/components/AddNewRiskForm/index.tsx
@@ -64,17 +64,6 @@ const COMPONENT_CONSTANTS = {
   COMPACT_CONTENT_WIDTH: 970, // Account for scrollbar (~17px)
 } as const;
 
-const VALIDATION_LIMITS = {
-  RISK_NAME: { MIN: 3, MAX: 255 },
-  RISK_DESCRIPTION: { MIN: 1, MAX: 256 },
-  POTENTIAL_IMPACT: { MIN: 1, MAX: 256 },
-  REVIEW_NOTES: { MIN: 0, MAX: 1024 },
-  MITIGATION_PLAN: { MIN: 1, MAX: 1024 },
-  IMPLEMENTATION_STRATEGY: { MIN: 1, MAX: 1024 },
-  RECOMMENDATIONS: { MIN: 1, MAX: 1024 },
-  REQUIRED_FIELD: { MIN: 1 },
-} as const;
-
 const riskInitialState: RiskFormValues = {
   riskName: "",
   actionOwner: 0,
diff --git a/Clients/src/presentation/components/Cards/ProjectCard/index.tsx b/Clients/src/presentation/components/Cards/ProjectCard/index.tsx
index 3343469ffb..ee198e78f9 100644
--- a/Clients/src/presentation/components/Cards/ProjectCard/index.tsx
+++ b/Clients/src/presentation/components/Cards/ProjectCard/index.tsx
@@ -265,7 +265,7 @@ export const ProjectCard = React.memo(function ProjectCard({ project, isLoading
               />
               <Stack direction="row" alignItems="center" spacing={0.5}>
                 <Typography sx={progressStyle}>
-                  {`Subcontrols: ${
+                  {`Requirements: ${
                     complianceProgressData?.allDonesubControls ?? 0
                   } out of ${complianceProgressData?.allsubControls ?? 0}`}
                 </Typography>
@@ -303,7 +303,7 @@ export const ProjectCard = React.memo(function ProjectCard({ project, isLoading
               />
               <Stack direction="row" alignItems="center" spacing={0.5}>
                 <Typography sx={progressStyle}>
-                  {`Assessments: ${
+                  {`Controls: ${
                     assessmentProgressData?.answeredQuestions ?? 0
                   } out of ${assessmentProgressData?.totalQuestions ?? 0}`}
                 </Typography>
@@ -373,7 +373,7 @@ export const ProjectCard = React.memo(function ProjectCard({ project, isLoading
                 />
                 <Stack direction="row" alignItems="center" spacing={0.5}>
                   <Typography sx={progressStyle}>
-                    {`Subcontrols: ${
+                    {`Requirements: ${
                       complianceProgressData?.allDonesubControls ?? 0
                     } out of ${complianceProgressData?.allsubControls ?? 0}`}
                   </Typography>
@@ -411,7 +411,7 @@ export const ProjectCard = React.memo(function ProjectCard({ project, isLoading
                 />
                 <Stack direction="row" alignItems="center" spacing={0.5}>
                   <Typography sx={progressStyle}>
-                    {`Assessments: ${
+                    {`Controls: ${
                       assessmentProgressData?.answeredQuestions ?? 0
                     } out of ${assessmentProgressData?.totalQuestions ?? 0}`}
                   </Typography>
diff --git a/Clients/src/presentation/components/CreateProjectForm/index.tsx b/Clients/src/presentation/components/CreateProjectForm/index.tsx
index 954d850cc4..cab833ae45 100644
--- a/Clients/src/presentation/components/CreateProjectForm/index.tsx
+++ b/Clients/src/presentation/components/CreateProjectForm/index.tsx
@@ -225,10 +225,6 @@ export function CreateProjectForm({
     () => [
       { _id: 1, name: HighRiskRole.DEPLOYER },
       { _id: 2, name: HighRiskRole.PROVIDER },
-      { _id: 3, name: HighRiskRole.DISTRIBUTOR },
-      { _id: 4, name: HighRiskRole.IMPORTER },
-      { _id: 5, name: HighRiskRole.PRODUCT_MANUFACTURER },
-      { _id: 6, name: HighRiskRole.AUTHORIZED_REPRESENTATIVE },
     ],
     []
   );
diff --git a/Clients/src/presentation/components/Drawer/ClauseDrawerDialog/index.tsx b/Clients/src/presentation/components/Drawer/ClauseDrawerDialog/index.tsx
index 4858b29eea..019ad19187 100644
--- a/Clients/src/presentation/components/Drawer/ClauseDrawerDialog/index.tsx
+++ b/Clients/src/presentation/components/Drawer/ClauseDrawerDialog/index.tsx
@@ -725,9 +725,10 @@ const ISO42001ClauseDrawerDialog: React.FC<ISO42001ClauseDrawerProps> = ({
             padding="15px 20px"
           >
             <Typography fontSize={15} fontWeight={700}>
-              {clause?.clause_no
-                ? `${clause.clause_no}.${subclause?.order_no || 1}`
-                : "Clause"}{" "}
+              {subclause?.subclause_id
+                ?? (clause?.clause_no
+                  ? `${clause.clause_no}.${subclause?.order_no || 1}`
+                  : "Clause")}{" "}
               {subclause?.title}
             </Typography>
             <Button
diff --git a/Clients/src/presentation/components/EntityLinkSelector/index.tsx b/Clients/src/presentation/components/EntityLinkSelector/index.tsx
index c7f13df4c9..926a8c2bcf 100644
--- a/Clients/src/presentation/components/EntityLinkSelector/index.tsx
+++ b/Clients/src/presentation/components/EntityLinkSelector/index.tsx
@@ -212,7 +212,7 @@ const EntityLinkSelector: React.FC<EntityLinkSelectorProps> = ({
                 subControls.forEach((sub: any) => {
                   const subId = sub.id || sub.dataValues?.id;
                   const subNo = sub.order_no || sub.dataValues?.order_no || "";
-                  const subTitle = sub.title || sub.dataValues?.title || "Subcontrol";
+                  const subTitle = sub.title || sub.dataValues?.title || "Control";
                   // Format: "1.1.a - Subcontrol Title"
                   const subDisplayName = categoryNo && controlNo && subNo
                     ? `${categoryNo}.${controlNo}.${subNo} - ${subTitle}`
@@ -273,12 +273,13 @@ const EntityLinkSelector: React.FC<EntityLinkSelectorProps> = ({
               const subClauses = clauseData.subClauses || [];
               subClauses.forEach((sub: any) => {
                 const subData = sub.dataValues || sub;
-                // Format: "Clause 4.1 - Understanding the organization..."
-                // Fields: clauseData.clause_no, subData.order_no
+                // Format: "Clause 6.1.1 - General — actions to address..."
+                // Prefer canonical subclause_id when present (handles 3-level ids like 6.1.1)
+                const displayId = subData.subclause_id ?? `${clauseData.clause_no}.${subData.order_no}`;
                 subEntityList.push({
                   _id: `iso42001_subclause_${subData.id}`,
                   entity_id: subData.id,
-                  name: `Clause ${clauseData.clause_no}.${subData.order_no} - ${subData.title}`,
+                  name: `Clause ${displayId} - ${subData.title}`,
                   type: "iso42001_subclause",
                 });
               });
@@ -603,9 +604,9 @@ const EntityLinkSelector: React.FC<EntityLinkSelectorProps> = ({
       iso27001_subclause: "ISO 27001 Clause",
       iso27001_annexcontrol: "ISO 27001 Annex",
       iso27001_assessment: "ISO 27001 Assessment",
-      eu_control: "EU AI Act Control",
-      eu_subcontrol: "EU AI Act Subcontrol",
-      eu_assessment: "EU AI Act Assessment",
+      eu_control: "EU AI Act Requirement",
+      eu_subcontrol: "EU AI Act Sub-requirement",
+      eu_assessment: "EU AI Act Control",
     };
     return displayNames[type] || type;
   };
diff --git a/Clients/src/presentation/components/Forms/ProjectForm/index.tsx b/Clients/src/presentation/components/Forms/ProjectForm/index.tsx
index edcc45d98e..02bcb80ca1 100644
--- a/Clients/src/presentation/components/Forms/ProjectForm/index.tsx
+++ b/Clients/src/presentation/components/Forms/ProjectForm/index.tsx
@@ -272,10 +272,6 @@ const { users } = useUsers();
     () => [
       { _id: 1, name: HighRiskRole.DEPLOYER },
       { _id: 2, name: HighRiskRole.PROVIDER },
-      { _id: 3, name: HighRiskRole.DISTRIBUTOR },
-      { _id: 4, name: HighRiskRole.IMPORTER },
-      { _id: 5, name: HighRiskRole.PRODUCT_MANUFACTURER },
-      { _id: 6, name: HighRiskRole.AUTHORIZED_REPRESENTATIVE },
     ],
     []
   );
@@ -1021,7 +1017,7 @@ const { users } = useUsers();
               onChange={handleCheckboxChange}
               isChecked={values.enable_ai_data_insertion}
               value={values.enable_ai_data_insertion.toString()}
-              label="Enable this option to automatically fill in the Controls and Assessment questions with AI-generated answers, helping you save time. You can review and edit these answers anytime."
+              label="Enable this option to automatically fill in the Requirements and Controls questions with AI-generated answers, helping you save time. You can review and edit these answers anytime."
             />
           </Stack>
         )}
diff --git a/Clients/src/presentation/components/MetricSection/index.tsx b/Clients/src/presentation/components/MetricSection/index.tsx
index 7e1efe9a67..19eb95cdc9 100644
--- a/Clients/src/presentation/components/MetricSection/index.tsx
+++ b/Clients/src/presentation/components/MetricSection/index.tsx
@@ -24,11 +24,11 @@ const MetricSection: FC<MetricSectionProps> = ({
     value: string | number;
   }[] = [
     {
-      title: "Compliance tracker completion rate",
+      title: "Requirements tracker completion rate",
       value: `${controls.percentageComplete.toFixed(2)}%`,
     },
     {
-      title: "Assessment tracker completion rate",
+      title: "Controls tracker completion rate",
       value: `${assessments.percentageComplete.toFixed(2)}%`,
     },
   ];
diff --git a/Clients/src/presentation/components/Modals/Controlpane/NewControlPane.tsx b/Clients/src/presentation/components/Modals/Controlpane/NewControlPane.tsx
index 8ce7e298f7..69dfaffe6c 100644
--- a/Clients/src/presentation/components/Modals/Controlpane/NewControlPane.tsx
+++ b/Clients/src/presentation/components/Modals/Controlpane/NewControlPane.tsx
@@ -958,7 +958,7 @@ const NewControlPane = ({
 
         handleAlert({
           variant: "success",
-          body: "Control saved successfully",
+          body: "Requirement saved successfully",
           setAlert,
         });
 
@@ -1036,7 +1036,7 @@ const NewControlPane = ({
       )}
 
       {isSubmitting && (
-        <CustomizableToast title="Saving control. Please wait..." />
+        <CustomizableToast title="Saving requirement. Please wait..." />
       )}
 
       <Drawer
diff --git a/Clients/src/presentation/components/Modals/Controlpane/index.tsx b/Clients/src/presentation/components/Modals/Controlpane/index.tsx
index eefa6416ac..c4b2862a2d 100644
--- a/Clients/src/presentation/components/Modals/Controlpane/index.tsx
+++ b/Clients/src/presentation/components/Modals/Controlpane/index.tsx
@@ -161,7 +161,7 @@ const CustomModal: React.FC<ICustomModalProps> = ({
             {subControlTlts.map((_, index) => (
               <Tab
                 key={index}
-                label={`Subcontrol ${index + 1}`}
+                label={`Control ${index + 1}`}
                 sx={{ textTransform: "none" }}
               />
             ))}
@@ -256,19 +256,19 @@ const CustomModal: React.FC<ICustomModalProps> = ({
           >
             <Button
               variant="contained"
-              onClick={() => console.log("Previous Subcontrol clicked")}
+              onClick={() => console.log("Previous Control clicked")}
               sx={buttonStyle}
               disableRipple
             >
-              &lt;- Previous Subcontrol
+              &lt;- Previous Control
             </Button>
             <Button
               variant="contained"
-              onClick={() => console.log("Next Subcontrol clicked")}
+              onClick={() => console.log("Next Control clicked")}
               sx={buttonStyle}
               disableRipple
             >
-              Next Subcontrol -&gt;
+              Next Control -&gt;
             </Button>
           </Stack>
           <Button
diff --git a/Clients/src/presentation/components/Reporting/GenerateReport/constants.ts b/Clients/src/presentation/components/Reporting/GenerateReport/constants.ts
index 743aae3cd7..981ade26f8 100644
--- a/Clients/src/presentation/components/Reporting/GenerateReport/constants.ts
+++ b/Clients/src/presentation/components/Reporting/GenerateReport/constants.ts
@@ -33,7 +33,7 @@ export const REPORT_SECTION_GROUPS: ReportSectionGroup[] = [
     id: "complianceGovernance",
     label: "Compliance & Governance",
     sections: [
-      { id: "controls", label: "Controls", backendKey: "compliance" },
+      { id: "controls", label: "Requirements", backendKey: "compliance" },
       { id: "assessmentTracker", label: "Assessment Tracker", backendKey: "assessment" },
       { id: "clausesAndAnnexes", label: "Clauses & Annexes", backendKey: "clausesAndAnnexes" },
       { id: "nistSubcategories", label: "NIST Subcategories", backendKey: "nistSubcategories" },
@@ -193,8 +193,8 @@ export function selectionToBackendFormat(
  */
 export const EUAI_REPORT_TYPES = [
   "Use case risks report",
-  "Compliance tracker report",
-  "Assessment tracker report",
+  "Requirements tracker report",
+  "Controls tracker report",
   "Vendors and risks report",
   "Training registry report",
   "Policy manager report",
diff --git a/Clients/src/presentation/components/RichTextEditor/index.tsx b/Clients/src/presentation/components/RichTextEditor/index.tsx
index 7d495a32c8..969c6759fc 100644
--- a/Clients/src/presentation/components/RichTextEditor/index.tsx
+++ b/Clients/src/presentation/components/RichTextEditor/index.tsx
@@ -109,6 +109,19 @@ const RichTextEditor: React.FC<IRichTextEditorProps> = ({
     }
   }, [editor, isEditable]);
 
+  // TipTap's useEditor only consumes `content` on first mount. When the parent
+  // sets `initialContent` later (e.g. after an async fetch fills the form), the
+  // editor would otherwise stay empty. Sync only when the incoming value
+  // actually differs from the editor's current HTML so user keystrokes don't
+  // get clobbered.
+  useEffect(() => {
+    if (!editor) return;
+    const incoming = initialContent ?? "";
+    if (incoming !== editor.getHTML()) {
+      editor.commands.setContent(incoming, { emitUpdate: false });
+    }
+  }, [editor, initialContent]);
+
   useEffect(() => {
     return () => {
       editor?.destroy();
diff --git a/Clients/src/presentation/components/Table/FilesBasicTable/FileBasicTable.tsx b/Clients/src/presentation/components/Table/FilesBasicTable/FileBasicTable.tsx
index 36babbcac1..b133f1ce63 100644
--- a/Clients/src/presentation/components/Table/FilesBasicTable/FileBasicTable.tsx
+++ b/Clients/src/presentation/components/Table/FilesBasicTable/FileBasicTable.tsx
@@ -502,7 +502,11 @@ const FileBasicTable: React.FC<IFileBasicTableProps> = ({
                             }}
                             onClick={(event) => handleRowClick(row, event)}
                           >
-                            {row.source}
+                            {row.source === "Compliance tracker group"
+                              ? "Requirements tracker group"
+                              : row.source === "Assessment tracker group"
+                              ? "Controls tracker group"
+                              : row.source}
                           </Box>
                         ) : (
                           <Typography
diff --git a/Clients/src/presentation/components/Table/ProjectRiskMitigationTable/ProjectRiskMitigationTableBody.tsx b/Clients/src/presentation/components/Table/ProjectRiskMitigationTable/ProjectRiskMitigationTableBody.tsx
index 5cbd4970cd..7d87ebc1be 100644
--- a/Clients/src/presentation/components/Table/ProjectRiskMitigationTable/ProjectRiskMitigationTableBody.tsx
+++ b/Clients/src/presentation/components/Table/ProjectRiskMitigationTable/ProjectRiskMitigationTableBody.tsx
@@ -124,12 +124,12 @@ export const ProjectRiskMitigationTableBody: React.FC<
                     : row.type === "subclause"
                     ? "ISO42001: Sub-Clause"
                     : row.type === "assessment"
-                    ? "EU-AI-Act: Assessment"
+                    ? "EU-AI-Act: Control"
                     : row.type === "annexcontrol_27001"
                     ? "ISO27001: Annex Control"
                     : row.type === "annexsubclause_27001"
                     ? "ISO27001: Sub-Clause"
-                    : "EU-AI-Act: Control"}
+                    : "EU-AI-Act: Requirement"}
                 </TableCell>
                 <TableCell>
                   <CustomizableButton
diff --git a/Clients/src/presentation/components/Table/index.tsx b/Clients/src/presentation/components/Table/index.tsx
index 34b1c87e1c..eb0ece4e2d 100644
--- a/Clients/src/presentation/components/Table/index.tsx
+++ b/Clients/src/presentation/components/Table/index.tsx
@@ -51,8 +51,8 @@ interface TableProps {
   table: string;
   onRowClick?: (id: string | number) => void;
   label?: string;
-  setSelectedRow: (row: TableRow) => void;
-  setAnchorEl: (element: HTMLElement | null) => void;
+  setSelectedRow?: (row: TableRow) => void;
+  setAnchorEl?: (element: HTMLElement | null) => void;
 }
 
 
@@ -114,9 +114,9 @@ const CustomizableBasicTable = ({
     event: React.MouseEvent<HTMLTableRowElement>,
     rowData: TableRow
   ) => {
-    setSelectedRow(rowData);
+    setSelectedRow?.(rowData);
     setInputValues(rowData as InputValues);
-    setAnchorEl(event.currentTarget);
+    setAnchorEl?.(event.currentTarget);
     onRowClick?.(rowData.id);
   };
 
diff --git a/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/AssessmentSteps.tsx b/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/AssessmentSteps.tsx
index 8838463d91..b0e1dd5e29 100644
--- a/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/AssessmentSteps.tsx
+++ b/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/AssessmentSteps.tsx
@@ -6,16 +6,16 @@ const AssessmentSteps: IPageTourStep[] = [
   {
     target: '[data-joyride-id="assessment-progress-bar"]',
     content: {
-      header: "Assessment Progress",
-      body: "Track your assessment completion status in real-time. This progress indicator shows how many topics have been evaluated and what remains to be assessed.",
+      header: "Controls progress",
+      body: "Track your controls completion status in real-time. This progress indicator shows how many topics have been evaluated and what remains to be addressed.",
       icon: <BarChart3 size={20} color={background.main} />,
     },
   },
   {
     target: '[data-joyride-id="assessment-topics"]',
     content: {
-      header: "Assessment Topics",
-      body: "Navigate through different assessment categories and complete the evaluation questions for your AI project. Each topic covers specific aspects of AI risk and governance.",
+      header: "Controls topics",
+      body: "Navigate through different controls categories and complete the evaluation questions for your AI project. Each topic covers specific aspects of AI risk and governance.",
       icon: <ClipboardCheck size={20} color={background.main} />,
     },
   },
diff --git a/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/index.tsx b/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/index.tsx
index 3a777d58a2..861ce3115d 100644
--- a/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/index.tsx
+++ b/Clients/src/presentation/pages/Assessment/1.0AssessmentTracker/index.tsx
@@ -270,7 +270,7 @@ const AssessmentTracker = ({
             <StatsCard
               total={assessmentProgress.totalQuestions}
               completed={assessmentProgress.answeredQuestions}
-              title="Questions"
+              title="Controls"
               progressbarColor={brand.primary}
             />
           ) : (
@@ -280,7 +280,7 @@ const AssessmentTracker = ({
           )}
         </Stack>
         <Typography sx={{ ...pageHeadingStyle, mt: 4 }}>
-          Assessments status overview
+          Controls status overview
         </Typography>
         <Divider sx={{ marginY: 2 }} />
         <Box sx={{ display: "flex", width: "100%", height: "100vh", paddingLeft: "8px", paddingRight: 0 }}>
@@ -290,7 +290,7 @@ const AssessmentTracker = ({
               data-joyride-id="assessment-topics"
               ref={refs[1]}
             >
-              High risk conformity assessment
+              High risk conformity controls
             </Typography>
             <List>
               {loadingAssessmentTopics ? (
diff --git a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ComplianceSteps.tsx b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ComplianceSteps.tsx
index 7456bd315e..4b89c0e81b 100644
--- a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ComplianceSteps.tsx
+++ b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ComplianceSteps.tsx
@@ -15,8 +15,8 @@ const ComplianceSteps: IPageTourStep[] = [
   {
     target: '[data-joyride-id="control-groups"]',
     content: {
-      header: "Control groups",
-      body: "Controls are organized into logical groups and subcontrols for easier navigation. Complete each control to improve your compliance statistics and track progress by category.",
+      header: "Requirement groups",
+      body: "Requirements are organized into logical groups and their controls for easier navigation. Complete each requirement to improve your compliance statistics and track progress by category.",
       icon: <FolderTree size={20} color={background.main} />,
     },
     placement: "left",
diff --git a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlCategory.tsx b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlCategory.tsx
index 638fa5b3b2..552a69e84c 100644
--- a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlCategory.tsx
+++ b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlCategory.tsx
@@ -18,9 +18,9 @@ import ControlsTable from "./ControlsTable";
 import { border as borderPalette, status } from "../../../themes/palette";
 
 const Table_Columns = [
-  { id: 1, name: "Control Name" },
+  { id: 1, name: "Requirement Name" },
   { id: 2, name: "Owner" },
-  { id: 3, name: "# of Subcontrols" },
+  { id: 3, name: "# of Controls" },
   { id: 4, name: "Completion" },
 ];
 
diff --git a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlsTable.tsx b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlsTable.tsx
index f1fdc8fbf7..e73019d059 100644
--- a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlsTable.tsx
+++ b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/ControlsTable.tsx
@@ -196,7 +196,7 @@ const ControlsTable: React.FC<ControlsTableProps> = ({
       setCurrentFlashRow(control.id);
       setAlert({
         type: "success",
-        message: "Control updated successfully",
+        message: "Requirement updated successfully",
       });
 
       setTimeout(() => {
@@ -212,7 +212,7 @@ const ControlsTable: React.FC<ControlsTableProps> = ({
   const handleSaveError = () => {
     setAlert({
       type: "error",
-      message: "Failed to save control changes. Please try again.",
+      message: "Failed to save requirement changes. Please try again.",
     });
     setTimeout(() => {
       setAlert(null);
@@ -344,7 +344,7 @@ const ControlsTable: React.FC<ControlsTableProps> = ({
                       key={`noOfSubControls-${control.id}`}
                     >
                       <Typography component="span" variant="body2">
-                        {`${control.numberOfSubcontrols} Subcontrols`}
+                        {`${control.numberOfSubcontrols} Controls`}
                       </Typography>
                     </TableCell>
                     <TableCell
diff --git a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/index.tsx b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/index.tsx
index b45554bb95..097c179b28 100644
--- a/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/index.tsx
+++ b/Clients/src/presentation/pages/ComplianceTracker/1.0ComplianceTracker/index.tsx
@@ -124,7 +124,7 @@ const ComplianceTracker = ({
 
     try {
       const response = await getEntityById({
-        routeUrl: `/eu-ai-act/controlCategories`,
+        routeUrl: `/eu-ai-act/controlCategories?projectFrameworkId=${currentProjectFramework}`,
       });
       setControlCategories(response);
     } catch (err) {
@@ -144,12 +144,21 @@ const ComplianceTracker = ({
       // No EU AI Act framework - just stop loading
       setLoading(false);
     }
-  }, [currentProjectId, currentProjectFramework]);
+    // Also re-fetch when the project's role or risk classification changes,
+    // because the server filters categories by those fields. Without this
+    // dependency, editing the use-case settings wouldn't refresh the
+    // visible list until the user navigates away and back.
+  }, [
+    currentProjectId,
+    currentProjectFramework,
+    project?.type_of_high_risk_role,
+    project?.ai_risk_classification,
+  ]);
 
   if (loading) {
     return (
       <Stack className="compliance-tracker" sx={{ gap: "16px" }}>
-        <Typography sx={pageHeadingStyle}>Compliance tracker</Typography>
+        <Typography sx={pageHeadingStyle}>Requirements tracker</Typography>
         <CustomizableSkeleton
           variant="rectangular"
           minWidth={300}
@@ -168,7 +177,7 @@ const ComplianceTracker = ({
   if (!currentProjectId) {
     return (
       <Stack className="compliance-tracker" sx={{ gap: "16px" }}>
-        <Typography sx={pageHeadingStyle}>Compliance tracker</Typography>
+        <Typography sx={pageHeadingStyle}>Requirements tracker</Typography>
         <Typography>Please select a project to view compliance data</Typography>
       </Stack>
     );
@@ -190,7 +199,7 @@ const ComplianceTracker = ({
           <StatsCard
             completed={complianceData.allDonesubControls}
             total={complianceData.allsubControls}
-            title="Subcontrols"
+            title="Controls"
             progressbarColor={brand.primary}
           />
         </Stack>
diff --git a/Clients/src/presentation/pages/EntityGraph/DetailSidebar.tsx b/Clients/src/presentation/pages/EntityGraph/DetailSidebar.tsx
index 3fb0926ef0..eb3de5facc 100644
--- a/Clients/src/presentation/pages/EntityGraph/DetailSidebar.tsx
+++ b/Clients/src/presentation/pages/EntityGraph/DetailSidebar.tsx
@@ -274,10 +274,10 @@ const DetailSidebar: React.FC<DetailSidebarProps> = ({
                 <DetailText label="Goal" value={String(rawData.goal)} />
               )}
               {(rawData.doneSubcontrols !== undefined && rawData.totalSubcontrols !== undefined) && (
-                <DetailRow icon={<CheckCircle2 size={14} />} label="Subcontrols" value={`${rawData.doneSubcontrols}/${rawData.totalSubcontrols}`} />
+                <DetailRow icon={<CheckCircle2 size={14} />} label="Requirements" value={`${rawData.doneSubcontrols}/${rawData.totalSubcontrols}`} />
               )}
               {(rawData.answeredAssessments !== undefined && rawData.totalAssessments !== undefined) && (
-                <DetailRow icon={<FileText size={14} />} label="Assessments" value={`${rawData.answeredAssessments}/${rawData.totalAssessments}`} />
+                <DetailRow icon={<FileText size={14} />} label="Controls" value={`${rawData.answeredAssessments}/${rawData.totalAssessments}`} />
               )}
             </>
           )}
diff --git a/Clients/src/presentation/pages/Framework/Dashboard/AssignmentStatusCard.tsx b/Clients/src/presentation/pages/Framework/Dashboard/AssignmentStatusCard.tsx
index efb3719a78..44cad3e87f 100644
--- a/Clients/src/presentation/pages/Framework/Dashboard/AssignmentStatusCard.tsx
+++ b/Clients/src/presentation/pages/Framework/Dashboard/AssignmentStatusCard.tsx
@@ -422,7 +422,7 @@ const AssignmentStatusCard = ({ frameworksData }: AssignmentStatusCardProps) =>
                 >
                   <Typography sx={{ fontSize: 12, color: "#666666" }}>
                     {/* Use appropriate terminology based on framework type */}
-                    {isISO27001 || isISO42001 ? "Clauses" : "Controls"}
+                    {isISO27001 || isISO42001 ? "Clauses" : "Requirements"}
                   </Typography>
                   <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
                     {/* Status icon with color-coded completion indicator */}
diff --git a/Clients/src/presentation/pages/Framework/Dashboard/FrameworkProgressCard.tsx b/Clients/src/presentation/pages/Framework/Dashboard/FrameworkProgressCard.tsx
index 5c439cfa58..982d29f538 100644
--- a/Clients/src/presentation/pages/Framework/Dashboard/FrameworkProgressCard.tsx
+++ b/Clients/src/presentation/pages/Framework/Dashboard/FrameworkProgressCard.tsx
@@ -240,7 +240,7 @@ const FrameworkProgressCard = ({ frameworksData }: FrameworkProgressCardProps) =
                   }}
                 >
                   <Typography sx={{ fontSize: 12, color: "#666666" }}>
-                    {isISO27001 || isISO42001 ? "Clauses" : "Controls"}
+                    {isISO27001 || isISO42001 ? "Clauses" : "Requirements"}
                   </Typography>
                   <Box sx={{ display: "flex", alignItems: "center", gap: 0.5, justifyContent: "flex-end" }}>
                     <Typography sx={{ fontSize: 12, color: `${text.black}`, fontWeight: 500 }}>
diff --git a/Clients/src/presentation/pages/Framework/ISO27001/Clause/index.tsx b/Clients/src/presentation/pages/Framework/ISO27001/Clause/index.tsx
index 8c60416006..17eaa13705 100644
--- a/Clients/src/presentation/pages/Framework/ISO27001/Clause/index.tsx
+++ b/Clients/src/presentation/pages/Framework/ISO27001/Clause/index.tsx
@@ -179,7 +179,7 @@ const ISO27001Clause = ({
       setLoadingSubClauses((prev) => ({ ...prev, [clauseId]: true }));
       try {
         const response = await ISO27001GetSubClauseByClauseId({
-          routeUrl: `/iso-27001/subClauses/byClauseId/${clauseId}`,
+          routeUrl: `/iso-27001/subClauses/byClauseId/${clauseId}?projectFrameworkId=${projectFrameworkId}`,
         });
         const detailedSubClauses = response.data;
 
@@ -333,19 +333,100 @@ const ISO27001Clause = ({
             <CircularProgress size={24} />
           </Stack>
         ) : filteredSubClauses.length > 0 ? (
-          filteredSubClauses.map((subClause: any, index: number) => (
+          // Enrich the list with synthetic parent-header rows for any group
+          // of 3-level subclauses (e.g. 6.1.1-6.1.3 gets a "6.1" header above
+          // it). Parent titles come from the well-known ISO standard names —
+          // headers are display-only, not fillable.
+          (() => {
+            const PARENT_TITLES: Record<string, string> = {
+              "6.1": "Actions to address risks and opportunities",
+            };
+            const enriched: any[] = [];
+            let currentPrefix: string | null = null;
+            for (const sc of filteredSubClauses) {
+              const id = sc.subclause_id;
+              const isThreeLevel =
+                typeof id === "string" &&
+                (id.match(/\./g) || []).length >= 2;
+              if (isThreeLevel) {
+                const prefix = id.split(".").slice(0, 2).join(".");
+                if (prefix !== currentPrefix) {
+                  enriched.push({
+                    __isParent: true,
+                    subclause_id: prefix,
+                    title: PARENT_TITLES[prefix] ?? prefix,
+                  });
+                  currentPrefix = prefix;
+                }
+              } else {
+                currentPrefix = null;
+              }
+              enriched.push(sc);
+            }
+            return enriched;
+          })().map((subClause: any, index: number, arr: any[]) => {
+            const isNested =
+              !subClause.__isParent &&
+              typeof subClause.subclause_id === "string" &&
+              (subClause.subclause_id.match(/\./g) || []).length >= 2;
+            const isLast = arr.length - 1 === index;
+
+            if (subClause.__isParent) {
+              return (
+                <Stack
+                  key={`parent-${subClause.subclause_id}`}
+                  sx={{
+                    display: "flex",
+                    flexDirection: "row",
+                    alignItems: "center",
+                    padding: "10px 16px",
+                    backgroundColor: "#fafbfc",
+                    borderBottom: "1px solid #eaecf0",
+                  }}
+                >
+                  <Typography
+                    fontSize={11}
+                    fontWeight={600}
+                    sx={{
+                      color: "#57606a",
+                      textTransform: "uppercase",
+                      letterSpacing: "0.04em",
+                    }}
+                  >
+                    {subClause.subclause_id} · {subClause.title}
+                  </Typography>
+                </Stack>
+              );
+            }
+
+            return (
             <Stack
               key={subClause.id}
               onClick={() => {
                 handleSubClauseClick(clause, subClause, index);
               }}
-              sx={styles.subClauseRow(
-                filteredSubClauses.length - 1 === index,
-                flashingRowId === subClause.id,
-              )}
+              sx={{
+                ...styles.subClauseRow(isLast, flashingRowId === subClause.id),
+                // Subtle indent + hairline tree-tick to mark nested children.
+                ...(isNested
+                  ? {
+                      padding: "16px 16px 16px 40px",
+                      position: "relative",
+                      "&::before": {
+                        content: '""',
+                        position: "absolute",
+                        left: "20px",
+                        top: "50%",
+                        width: "12px",
+                        height: "1px",
+                        backgroundColor: "#c9d1d9",
+                      },
+                    }
+                  : {}),
+              }}
             >
               <Typography fontSize={13}>
-                {clause.order_no + "." + (index + 1)}{" "}
+                {subClause.subclause_id ?? `${clause.order_no}.${index + 1}`}{" "}
                 {subClause.title ?? "Untitled"}
               </Typography>
               <StatusDropdown
@@ -358,7 +439,8 @@ const ISO27001Clause = ({
                 userRole={userRoleName}
               />
             </Stack>
-          ))
+            );
+          })
         ) : (
           <Stack sx={styles.noSubClausesContainer}>
             No matching subclauses
diff --git a/Clients/src/presentation/pages/Framework/ISO42001/Clause/index.tsx b/Clients/src/presentation/pages/Framework/ISO42001/Clause/index.tsx
index f6082636a3..eabd18040e 100644
--- a/Clients/src/presentation/pages/Framework/ISO42001/Clause/index.tsx
+++ b/Clients/src/presentation/pages/Framework/ISO42001/Clause/index.tsx
@@ -181,7 +181,7 @@ const ISO42001Clause = ({
       setLoadingSubClauses((prev) => ({ ...prev, [clauseId]: true }));
       try {
         const response = await GetSubClausesById({
-          routeUrl: `/iso-42001/subClauses/byClauseId/${clauseId}`,
+          routeUrl: `/iso-42001/subClauses/byClauseId/${clauseId}?projectFrameworkId=${projectFrameworkId}`,
         });
         const detailedSubClauses = response.data;
 
@@ -330,19 +330,106 @@ const ISO42001Clause = ({
             <CircularProgress size={24} />
           </Stack>
         ) : filteredSubClauses.length > 0 ? (
-          filteredSubClauses.map((subClause: any, index: number) => (
+          // Enrich the list with synthetic parent-header rows for any group
+          // of 3-level subclauses (e.g. 6.1.1-6.1.4 gets a "6.1" header above
+          // it). Parent titles are taken from the well-known ISO standard
+          // names — headers are display-only, not fillable.
+          (() => {
+            const PARENT_TITLES: Record<string, string> = {
+              "6.1": "Actions to address risks and opportunities",
+            };
+            const enriched: any[] = [];
+            let currentPrefix: string | null = null;
+            for (const sc of filteredSubClauses) {
+              const id = sc.subclause_id;
+              const isThreeLevel =
+                typeof id === "string" &&
+                (id.match(/\./g) || []).length >= 2;
+              if (isThreeLevel) {
+                const prefix = id.split(".").slice(0, 2).join(".");
+                if (prefix !== currentPrefix) {
+                  enriched.push({
+                    __isParent: true,
+                    subclause_id: prefix,
+                    title: PARENT_TITLES[prefix] ?? prefix,
+                  });
+                  currentPrefix = prefix;
+                }
+              } else {
+                currentPrefix = null;
+              }
+              enriched.push(sc);
+            }
+            return enriched;
+          })().map((subClause: any, index: number, arr: any[]) => {
+            // A subclause is "nested" (third-level, e.g. 6.1.1) when its
+            // canonical subclause_id contains two dots. Visually indent these
+            // relative to flat items like 6.2, and add a left border so the
+            // nested group reads as a grouped sub-section.
+            const isNested =
+              !subClause.__isParent &&
+              typeof subClause.subclause_id === "string" &&
+              (subClause.subclause_id.match(/\./g) || []).length >= 2;
+            const isLast = arr.length - 1 === index;
+
+            // Synthetic parent header — not fillable, no status dropdown,
+            // different styling so users see it as a section header.
+            if (subClause.__isParent) {
+              return (
+                <Stack
+                  key={`parent-${subClause.subclause_id}`}
+                  sx={{
+                    display: "flex",
+                    flexDirection: "row",
+                    alignItems: "center",
+                    padding: "10px 16px",
+                    backgroundColor: "#fafbfc",
+                    borderBottom: "1px solid #eaecf0",
+                  }}
+                >
+                  <Typography
+                    fontSize={11}
+                    fontWeight={600}
+                    sx={{
+                      color: "#57606a",
+                      textTransform: "uppercase",
+                      letterSpacing: "0.04em",
+                    }}
+                  >
+                    {subClause.subclause_id} · {subClause.title}
+                  </Typography>
+                </Stack>
+              );
+            }
+
+            return (
             <Stack
               key={subClause.id}
               onClick={() => {
                 handleSubClauseClick(clause, subClause, index);
               }}
-              sx={styles.subClauseRow(
-                filteredSubClauses.length - 1 === index,
-                flashingRowId === subClause.id,
-              )}
+              sx={{
+                ...styles.subClauseRow(isLast, flashingRowId === subClause.id),
+                // Subtle indent + hairline tree-tick to mark nested children.
+                ...(isNested
+                  ? {
+                      padding: "16px 16px 16px 40px",
+                      position: "relative",
+                      "&::before": {
+                        content: '""',
+                        position: "absolute",
+                        left: "20px",
+                        top: "50%",
+                        width: "12px",
+                        height: "1px",
+                        backgroundColor: "#c9d1d9",
+                      },
+                    }
+                  : {}),
+              }}
             >
               <Typography fontSize={13}>
-                {clause.clause_no + "." + (index + 1)}{" "}
+                {subClause.subclause_id ?? `${clause.clause_no}.${index + 1}`}{" "}
                 {subClause.title ?? "Untitled"}
               </Typography>
               <StatusDropdown
@@ -355,7 +442,8 @@ const ISO42001Clause = ({
                 userRole={userRoleName}
               />
             </Stack>
-          ))
+            );
+          })
         ) : (
           <Stack sx={styles.noSubClausesContainer}>
             No matching subclauses
diff --git a/Clients/src/presentation/pages/Framework/ISO42001/types.ts b/Clients/src/presentation/pages/Framework/ISO42001/types.ts
index 18f0f38e14..ac1c256399 100644
--- a/Clients/src/presentation/pages/Framework/ISO42001/types.ts
+++ b/Clients/src/presentation/pages/Framework/ISO42001/types.ts
@@ -45,6 +45,7 @@ export interface ISO42001Clause {
 export interface ISO42001SubClause {
   id: number;
   clause_id: number;
+  subclause_id?: string; // Canonical subclause label from the struct (e.g. "6.1.1", "6.3")
   index?: number | string; // Display index (e.g., 1, 2, 3)
   title: string;
   summary?: string;
diff --git a/Clients/src/presentation/pages/Framework/index.tsx b/Clients/src/presentation/pages/Framework/index.tsx
index e58e562def..b9bcd81684 100644
--- a/Clients/src/presentation/pages/Framework/index.tsx
+++ b/Clients/src/presentation/pages/Framework/index.tsx
@@ -1032,13 +1032,13 @@ const Framework = () => {
                   value: "linked-models",
                   icon: "Link",
                   count: linkedModelsCount,
-                  tooltip: "AI models mapped to this framework's controls",
+                  tooltip: "AI models mapped to this framework's requirements",
                 },
                 {
-                  label: "Controls and Requirements",
+                  label: "Requirements and Controls",
                   value: "controls",
                   icon: "FileCode",
-                  tooltip: "Regulatory controls and their implementation status",
+                  tooltip: "Regulatory requirements and the controls implementing them",
                 },
                 {
                   label: "Settings",
diff --git a/Clients/src/presentation/pages/ISO/Clause/index.tsx b/Clients/src/presentation/pages/ISO/Clause/index.tsx
index dabdeceed1..72cd5ec83a 100644
--- a/Clients/src/presentation/pages/ISO/Clause/index.tsx
+++ b/Clients/src/presentation/pages/ISO/Clause/index.tsx
@@ -84,7 +84,7 @@ const ISO42001Clauses = ({
       setLoadingSubClauses((prev) => ({ ...prev, [clauseId]: true }));
       try {
         const response = await GetSubClausesById({
-          routeUrl: `/iso-42001/subClauses/byClauseId/${clauseId}`,
+          routeUrl: `/iso-42001/subClauses/byClauseId/${clauseId}?projectFrameworkId=${projectFrameworkId}`,
         });
 
         const detailedSubClauses = response.data;
diff --git a/Clients/src/presentation/pages/IntakeFormBuilder/types.ts b/Clients/src/presentation/pages/IntakeFormBuilder/types.ts
index af5a003b11..708a3cd362 100644
--- a/Clients/src/presentation/pages/IntakeFormBuilder/types.ts
+++ b/Clients/src/presentation/pages/IntakeFormBuilder/types.ts
@@ -392,10 +392,6 @@ export const DEFAULT_USE_CASE_FIELDS: FormField[] = [
     options: [
       { label: "Deployer", value: "Deployer" },
       { label: "Provider", value: "Provider" },
-      { label: "Distributor", value: "Distributor" },
-      { label: "Importer", value: "Importer" },
-      { label: "Product manufacturer", value: "Product manufacturer" },
-      { label: "Authorized representative", value: "Authorized representative" },
     ],
     entityFieldMapping: "type_of_high_risk_role",
     order: 4,
diff --git a/Clients/src/presentation/pages/ProjectView/ProjectFrameworks/index.tsx b/Clients/src/presentation/pages/ProjectView/ProjectFrameworks/index.tsx
index 4a1509bd92..c51db1ed9c 100644
--- a/Clients/src/presentation/pages/ProjectView/ProjectFrameworks/index.tsx
+++ b/Clients/src/presentation/pages/ProjectView/ProjectFrameworks/index.tsx
@@ -36,8 +36,8 @@ const FRAMEWORK_IDS = {
 } as const;
 
 const TRACKER_TABS = [
-  { label: "Controls", value: "compliance" },
-  { label: "Assessments", value: "assessment" },
+  { label: "Requirements", value: "compliance" },
+  { label: "Controls", value: "assessment" },
 ] as const;
 
 type TrackerTab = (typeof TRACKER_TABS)[number]["value"];
diff --git a/Clients/src/presentation/pages/ProjectView/ProjectSettings/index.tsx b/Clients/src/presentation/pages/ProjectView/ProjectSettings/index.tsx
index deb575f5b8..a13bbb246b 100644
--- a/Clients/src/presentation/pages/ProjectView/ProjectSettings/index.tsx
+++ b/Clients/src/presentation/pages/ProjectView/ProjectSettings/index.tsx
@@ -74,10 +74,6 @@ const geographyItems = [
 const highRiskRoleItems = [
   { _id: 1, name: HighRiskRole.DEPLOYER },
   { _id: 2, name: HighRiskRole.PROVIDER },
-  { _id: 3, name: HighRiskRole.DISTRIBUTOR },
-  { _id: 4, name: HighRiskRole.IMPORTER },
-  { _id: 5, name: HighRiskRole.PRODUCT_MANUFACTURER },
-  { _id: 6, name: HighRiskRole.AUTHORIZED_REPRESENTATIVE },
 ];
 
 enum ProjectStatusEnum {
diff --git a/Clients/src/presentation/pages/ProjectView/ProjectViewSteps.tsx b/Clients/src/presentation/pages/ProjectView/ProjectViewSteps.tsx
index c9c3007302..62c80b6b91 100644
--- a/Clients/src/presentation/pages/ProjectView/ProjectViewSteps.tsx
+++ b/Clients/src/presentation/pages/ProjectView/ProjectViewSteps.tsx
@@ -33,8 +33,8 @@ const ProjectViewSteps: IPageTourStep[] = [
   {
     target: '[data-joyride-id="project-assessments"]',
     content: {
-      header: "Assessments and evidence",
-      body: "Access completed assessments, linked policies, and uploaded evidence files. Maintain comprehensive documentation for audit readiness.",
+      header: "Controls and evidence",
+      body: "Access completed controls, linked policies, and uploaded evidence files. Maintain comprehensive documentation for audit readiness.",
       icon: <FileText size={20} color={background.main} />,
     },
     placement: "bottom",
diff --git a/Clients/src/presentation/pages/ProjectView/RisksView/index.tsx b/Clients/src/presentation/pages/ProjectView/RisksView/index.tsx
index da7794cb1b..cea30f3114 100644
--- a/Clients/src/presentation/pages/ProjectView/RisksView/index.tsx
+++ b/Clients/src/presentation/pages/ProjectView/RisksView/index.tsx
@@ -10,8 +10,6 @@ import {
   useMemo,
   useCallback,
   memo,
-  lazy,
-  Suspense,
   useEffect,
 } from "react";
 import BasicTable from "../../../components/Table";
@@ -141,7 +139,7 @@ const RisksView: FC<RisksViewProps> = memo(
       [risksTableCols, risksTableRows]
     );
 
-    const [riskData1, setRiskData] = useState<ProjectRisk[] | VendorRisk[]>([]);
+    const [, setRiskData] = useState<ProjectRisk[] | VendorRisk[]>([]);
 
     const fetchRiskData = useCallback(async () => {
       try {
diff --git a/Clients/src/presentation/pages/ProjectView/V1.0ProjectView/Overview/index.tsx b/Clients/src/presentation/pages/ProjectView/V1.0ProjectView/Overview/index.tsx
index 3b719cc60d..d9d8ba994b 100644
--- a/Clients/src/presentation/pages/ProjectView/V1.0ProjectView/Overview/index.tsx
+++ b/Clients/src/presentation/pages/ProjectView/V1.0ProjectView/Overview/index.tsx
@@ -196,7 +196,7 @@ const VWProjectOverview = ({ project }: { project?: Project }) => {
     assessmentProgress?.totalQuestions ?? 0,
   ];
 
-  const titleEuAct = ["Subcontrols", "Assessments"];
+  const titleEuAct = ["Requirements", "Controls"];
 
   const completedIso42001Numbers = [
     clausesProgress?.doneSubclauses ?? 0,
diff --git a/Clients/tsconfig.app.json b/Clients/tsconfig.app.json
index d54efa28da..6214757e3d 100644
--- a/Clients/tsconfig.app.json
+++ b/Clients/tsconfig.app.json
@@ -29,7 +29,8 @@
       "@user-guide-content/*": [
         "../shared/user-guide-content/*"
       ]
-    }
+    },
+    "ignoreDeprecations": "6.0"
   },
   "include": [
     "src",
diff --git a/EvalServer/requirements.txt b/EvalServer/requirements.txt
index 8772e7834a..c493556841 100644
--- a/EvalServer/requirements.txt
+++ b/EvalServer/requirements.txt
@@ -39,7 +39,7 @@ httpcore==1.0.9
 httplib2==0.31.0
 httptools==0.7.1
 httpx==0.28.1
-huggingface-hub==0.36.0
+huggingface-hub==1.3.0
 idna==3.11
 importlib_metadata==8.7.0
 invoke==2.2.1
diff --git a/Servers/controllers/eu.ctrl.ts b/Servers/controllers/eu.ctrl.ts
index 2bfe0c9cbd..b65abb6d9f 100644
--- a/Servers/controllers/eu.ctrl.ts
+++ b/Servers/controllers/eu.ctrl.ts
@@ -22,6 +22,7 @@ import {
   getControlByIdForProjectQuery,
   getControlStructByControlCategoryIdForAProjectQuery,
   getTopicByIdForProjectQuery,
+  getVisibleEuCategoryIdsForProject,
   updateQuestionEUByIdQuery,
   updateSubcontrolEUByIdQuery,
 } from "../utils/eu.utils";
@@ -1271,8 +1272,11 @@ export async function getAllControlCategories(
   req: Request,
   res: Response
 ): Promise<any> {
+  const projectFrameworkIdRaw = req.query.projectFrameworkId as string | undefined;
+  const projectFrameworkId = projectFrameworkIdRaw ? parseInt(projectFrameworkIdRaw) : undefined;
+
   logProcessing({
-    description: "starting getAllControlCategories",
+    description: `starting getAllControlCategories${projectFrameworkId ? ` (filtered by projectFrameworkId=${projectFrameworkId})` : ''}`,
     functionName: "getAllControlCategories",
     fileName: "eu.ctrl.ts",
     userId: req.userId!,
@@ -1281,7 +1285,18 @@ export async function getAllControlCategories(
   logger.debug("🔍 Fetching all control categories");
 
   try {
-    const controlCategories = await getAllControlCategoriesQuery(req.organizationId!);
+    let controlCategories = await getAllControlCategoriesQuery(req.organizationId!);
+
+    if (projectFrameworkId && !isNaN(projectFrameworkId)) {
+      const visibleIds = await getVisibleEuCategoryIdsForProject(
+        projectFrameworkId,
+        req.organizationId!
+      );
+      const allowed = new Set(visibleIds);
+      controlCategories = (controlCategories as any[]).filter((cc: any) =>
+        allowed.has(cc.id)
+      ) as typeof controlCategories;
+    }
 
     await logSuccess({
       eventType: "Read",
diff --git a/Servers/controllers/iso27001.ctrl.ts b/Servers/controllers/iso27001.ctrl.ts
index f7bdebced1..72e7bf2ac6 100644
--- a/Servers/controllers/iso27001.ctrl.ts
+++ b/Servers/controllers/iso27001.ctrl.ts
@@ -311,20 +311,28 @@ export async function getSubClausesByClauseId(
   res: Response
 ): Promise<any> {
   const clauseId = parseInt(Array.isArray(req.params.id) ? req.params.id[0] : req.params.id);
+  const projectFrameworkId = parseInt(req.query.projectFrameworkId as string);
+
+  if (!projectFrameworkId || isNaN(projectFrameworkId)) {
+    return res
+      .status(400)
+      .json(STATUS_CODE[400]("projectFrameworkId query param is required"));
+  }
 
   logProcessing({
-    description: `starting getSubClausesByClauseId for clause ID ${clauseId}`,
+    description: `starting getSubClausesByClauseId for clause ID ${clauseId} and project framework ID ${projectFrameworkId}`,
     functionName: "getSubClausesByClauseId",
     fileName: "iso27001.ctrl.ts",
     userId: req.userId!,
     tenantId: req.organizationId!,
   });
-  logger.debug(`🔍 Fetching sub-clauses for clause ID ${clauseId}`);
+  logger.debug(`🔍 Fetching sub-clauses for clause ID ${clauseId} (pf=${projectFrameworkId})`);
 
   try {
     const subClauses = await getSubClausesByClauseIdQuery(
       clauseId,
-      req.organizationId!
+      req.organizationId!,
+      projectFrameworkId
     );
     if (subClauses) {
       await logSuccess({
diff --git a/Servers/controllers/iso42001.ctrl.ts b/Servers/controllers/iso42001.ctrl.ts
index dbb0c4c497..65c6879d05 100644
--- a/Servers/controllers/iso42001.ctrl.ts
+++ b/Servers/controllers/iso42001.ctrl.ts
@@ -313,20 +313,28 @@ export async function getSubClausesByClauseId(
   res: Response
 ): Promise<any> {
   const clauseId = parseInt(Array.isArray(req.params.id) ? req.params.id[0] : req.params.id);
+  const projectFrameworkId = parseInt(req.query.projectFrameworkId as string);
+
+  if (!projectFrameworkId || isNaN(projectFrameworkId)) {
+    return res
+      .status(400)
+      .json(STATUS_CODE[400]("projectFrameworkId query param is required"));
+  }
 
   logProcessing({
-    description: `starting getSubClausesByClauseId for clause ID ${clauseId}`,
+    description: `starting getSubClausesByClauseId for clause ID ${clauseId} and project framework ID ${projectFrameworkId}`,
     functionName: "getSubClausesByClauseId",
     fileName: "iso42001.ctrl.ts",
     userId: req.userId!,
     tenantId: req.organizationId!,
   });
-  logger.debug(`🔍 Fetching sub-clauses for clause ID ${clauseId}`);
+  logger.debug(`🔍 Fetching sub-clauses for clause ID ${clauseId} (pf=${projectFrameworkId})`);
 
   try {
     const subClauses = await getSubClausesByClauseIdQuery(
       clauseId,
-      req.organizationId!
+      req.organizationId!,
+      projectFrameworkId
     );
     if (subClauses) {
       await logSuccess({
diff --git a/Servers/database/migrations/20260417131715-add-eu-act-filter-metadata.js b/Servers/database/migrations/20260417131715-add-eu-act-filter-metadata.js
new file mode 100644
index 0000000000..e2508ae9a1
--- /dev/null
+++ b/Servers/database/migrations/20260417131715-add-eu-act-filter-metadata.js
@@ -0,0 +1,43 @@
+'use strict';
+
+/**
+ * Adds a single `article` text column to the three EU AI Act struct tables.
+ * `article` is a simple scalar pointer back to the AI Act article/paragraph
+ * a requirement implements, so it can safely live as a column.
+ *
+ * `roles` and `risk_tiers` are modelled via junction tables in a separate
+ * migration (see 20260417151000-add-eu-act-roles-risk-tiers-junctions.js).
+ */
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.sequelize.query(`
+      ALTER TABLE verifywise.controlcategories_struct_eu
+        ADD COLUMN IF NOT EXISTS article TEXT;
+    `);
+
+    await queryInterface.sequelize.query(`
+      ALTER TABLE verifywise.controls_struct_eu
+        ADD COLUMN IF NOT EXISTS article TEXT;
+    `);
+
+    await queryInterface.sequelize.query(`
+      ALTER TABLE verifywise.subcontrols_struct_eu
+        ADD COLUMN IF NOT EXISTS article TEXT;
+    `);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      ALTER TABLE verifywise.subcontrols_struct_eu
+        DROP COLUMN IF EXISTS article;
+    `);
+    await queryInterface.sequelize.query(`
+      ALTER TABLE verifywise.controls_struct_eu
+        DROP COLUMN IF EXISTS article;
+    `);
+    await queryInterface.sequelize.query(`
+      ALTER TABLE verifywise.controlcategories_struct_eu
+        DROP COLUMN IF EXISTS article;
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260417150652-update-ai-risk-classification-enum.js b/Servers/database/migrations/20260417150652-update-ai-risk-classification-enum.js
new file mode 100644
index 0000000000..8aeebd3cc8
--- /dev/null
+++ b/Servers/database/migrations/20260417150652-update-ai-risk-classification-enum.js
@@ -0,0 +1,105 @@
+'use strict';
+
+/**
+ * Updates verifywise.enum_projects_ai_risk_classification to the canonical
+ * 6-value set used by the EU AI Act filter:
+ *   'Prohibited', 'High risk', 'Limited risk', 'Minimal risk', 'GPAI', 'General Risk'
+ *
+ * Removes the legacy placeholders 'gpai', 'gpai_systemic', 'not_ai_system' which
+ * were in the original DB enum but never exposed via the TypeScript enum / UI.
+ *
+ * Strategy: PostgreSQL does not support DROP VALUE on enums. To cleanly rebuild
+ * the enum we create a new type, remap any existing data, swap the column type,
+ * and drop the old type.
+ */
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      // 1. Remap any rows still using the deprecated values to the closest new value.
+      //    'gpai' and 'gpai_systemic' map to 'GPAI'; 'not_ai_system' maps to
+      //    'Minimal risk' as the safest fallback (no AI Act obligations apply).
+      await queryInterface.sequelize.query(`
+        UPDATE verifywise.projects
+        SET ai_risk_classification = 'Minimal risk'
+        WHERE ai_risk_classification::text = 'not_ai_system';
+      `, { transaction: t });
+
+      await queryInterface.sequelize.query(`
+        UPDATE verifywise.projects
+        SET ai_risk_classification = 'Minimal risk'
+        WHERE ai_risk_classification::text IN ('gpai', 'gpai_systemic');
+      `, { transaction: t });
+      // ^ Temporarily map gpai/gpai_systemic to Minimal risk so the column can
+      //   accept the new enum. We re-map them to 'GPAI' after the swap below.
+
+      // 2. Create the new enum type.
+      await queryInterface.sequelize.query(`
+        CREATE TYPE verifywise.enum_projects_ai_risk_classification_new AS ENUM (
+          'Prohibited', 'High risk', 'Limited risk', 'Minimal risk', 'GPAI', 'General Risk'
+        );
+      `, { transaction: t });
+
+      // 3. Swap the column to the new type.
+      await queryInterface.sequelize.query(`
+        ALTER TABLE verifywise.projects
+        ALTER COLUMN ai_risk_classification
+        TYPE verifywise.enum_projects_ai_risk_classification_new
+        USING ai_risk_classification::text::verifywise.enum_projects_ai_risk_classification_new;
+      `, { transaction: t });
+
+      // 4. Drop the old type and rename the new one to the original name.
+      await queryInterface.sequelize.query(`
+        DROP TYPE verifywise.enum_projects_ai_risk_classification;
+      `, { transaction: t });
+      await queryInterface.sequelize.query(`
+        ALTER TYPE verifywise.enum_projects_ai_risk_classification_new
+        RENAME TO enum_projects_ai_risk_classification;
+      `, { transaction: t });
+
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      // Recreate the legacy enum shape.
+      await queryInterface.sequelize.query(`
+        CREATE TYPE verifywise.enum_projects_ai_risk_classification_legacy AS ENUM (
+          'High risk', 'Limited risk', 'Minimal risk', 'Prohibited', 'gpai', 'gpai_systemic', 'not_ai_system'
+        );
+      `, { transaction: t });
+
+      // Remap new-only values back to closest legacy equivalents.
+      await queryInterface.sequelize.query(`
+        UPDATE verifywise.projects
+        SET ai_risk_classification = 'Minimal risk'
+        WHERE ai_risk_classification::text IN ('GPAI', 'General Risk');
+      `, { transaction: t });
+
+      await queryInterface.sequelize.query(`
+        ALTER TABLE verifywise.projects
+        ALTER COLUMN ai_risk_classification
+        TYPE verifywise.enum_projects_ai_risk_classification_legacy
+        USING ai_risk_classification::text::verifywise.enum_projects_ai_risk_classification_legacy;
+      `, { transaction: t });
+
+      await queryInterface.sequelize.query(`
+        DROP TYPE verifywise.enum_projects_ai_risk_classification;
+      `, { transaction: t });
+      await queryInterface.sequelize.query(`
+        ALTER TYPE verifywise.enum_projects_ai_risk_classification_legacy
+        RENAME TO enum_projects_ai_risk_classification;
+      `, { transaction: t });
+
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+};
diff --git a/Servers/database/migrations/20260417150653-reseed-eu-act-struct-with-metadata.js b/Servers/database/migrations/20260417150653-reseed-eu-act-struct-with-metadata.js
new file mode 100644
index 0000000000..8364850c31
--- /dev/null
+++ b/Servers/database/migrations/20260417150653-reseed-eu-act-struct-with-metadata.js
@@ -0,0 +1,252 @@
+'use strict';
+
+/**
+ * Reseeds the EU AI Act struct tables to pick up:
+ *   - The new Prohibited practices category (order_no = 0)
+ *   - The rewritten General-purpose AI category (order_no = 13 content replaced)
+ *   - Five new categories (order_no 14-18): risk classification, QMS, provider
+ *     technical requirements, conformity / market access, deployer data rights
+ *   - The expanded transparency category (order_no = 8) with three new Art 50(2-4)
+ *     top-level controls
+ *   - Per-row `article` metadata
+ *
+ * Idempotent via SELECT-then-INSERT-or-UPDATE keyed on (parent, order_no). We do
+ * NOT use `ON CONFLICT DO NOTHING`: none of the struct tables have unique
+ * constraints on (framework_id, order_no) / (control_category_id, order_no) /
+ * (control_id, order_no), so ON CONFLICT would never match and every rerun
+ * would duplicate rows.
+ *
+ * After struct work, tenant rows (controls_eu + subcontrols_eu) are backfilled
+ * for every existing projects_frameworks tied to this framework — so new
+ * categories/controls/subcontrols appear filled-in as empty rows for in-flight
+ * projects without a separate post-migration step.
+ *
+ * `roles` and `risk_tiers` are not columns on these tables — they live in the
+ * category-level junction tables created by
+ * 20260417152215-add-eu-act-roles-risk-tiers-junctions.js.
+ */
+module.exports = {
+  async up(queryInterface) {
+    const { ControlCategories } = require('../../dist/structures/EU-AI-Act/compliance-tracker/controlCategories.struct');
+
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'EU AI Act' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[reseed-eu-act] EU AI Act framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      for (const category of ControlCategories) {
+        // Category: match existing by (framework_id, order_no). UPDATE if found,
+        // INSERT if not. Never creates duplicates on rerun.
+        const [[existingCat]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.controlcategories_struct_eu
+           WHERE framework_id = :frameworkId AND order_no = :order_no
+           LIMIT 1;`,
+          {
+            transaction: t,
+            replacements: { frameworkId, order_no: category.order_no },
+          }
+        );
+
+        let categoryId = existingCat?.id;
+        if (categoryId) {
+          await queryInterface.sequelize.query(
+            `UPDATE verifywise.controlcategories_struct_eu
+               SET title = :title, article = :article
+             WHERE id = :id;`,
+            {
+              transaction: t,
+              replacements: {
+                id: categoryId,
+                title: category.title,
+                article: category.article ?? null,
+              },
+            }
+          );
+        } else {
+          const [[inserted]] = await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.controlcategories_struct_eu
+               (framework_id, title, order_no, is_demo, article)
+             VALUES (:frameworkId, :title, :order_no, false, :article)
+             RETURNING id;`,
+            {
+              transaction: t,
+              replacements: {
+                frameworkId,
+                title: category.title,
+                order_no: category.order_no,
+                article: category.article ?? null,
+              },
+            }
+          );
+          categoryId = inserted.id;
+        }
+
+        if (!Array.isArray(category.controls)) continue;
+
+        for (const control of category.controls) {
+          const controlArticle = control.article ?? category.article ?? null;
+
+          const [[existingCtl]] = await queryInterface.sequelize.query(
+            `SELECT id FROM verifywise.controls_struct_eu
+             WHERE control_category_id = :categoryId AND order_no = :order_no
+             LIMIT 1;`,
+            {
+              transaction: t,
+              replacements: { categoryId, order_no: control.order_no },
+            }
+          );
+
+          let controlId = existingCtl?.id;
+          if (controlId) {
+            await queryInterface.sequelize.query(
+              `UPDATE verifywise.controls_struct_eu
+                 SET title = :title, description = :description, article = :article
+               WHERE id = :id;`,
+              {
+                transaction: t,
+                replacements: {
+                  id: controlId,
+                  title: control.title,
+                  description: control.description || '',
+                  article: controlArticle,
+                },
+              }
+            );
+          } else {
+            const [[inserted]] = await queryInterface.sequelize.query(
+              `INSERT INTO verifywise.controls_struct_eu
+                 (control_category_id, title, description, order_no, is_demo, article)
+               VALUES (:categoryId, :title, :description, :order_no, false, :article)
+               RETURNING id;`,
+              {
+                transaction: t,
+                replacements: {
+                  categoryId,
+                  title: control.title,
+                  description: control.description || '',
+                  order_no: control.order_no,
+                  article: controlArticle,
+                },
+              }
+            );
+            controlId = inserted.id;
+          }
+
+          if (!Array.isArray(control.subControls)) continue;
+
+          for (const sc of control.subControls) {
+            const scArticle = sc.article ?? controlArticle;
+
+            const [[existingSc]] = await queryInterface.sequelize.query(
+              `SELECT id FROM verifywise.subcontrols_struct_eu
+               WHERE control_id = :controlId AND order_no = :order_no
+               LIMIT 1;`,
+              {
+                transaction: t,
+                replacements: { controlId, order_no: sc.order_no },
+              }
+            );
+
+            if (existingSc?.id) {
+              await queryInterface.sequelize.query(
+                `UPDATE verifywise.subcontrols_struct_eu
+                   SET title = :title, description = :description, article = :article
+                 WHERE id = :id;`,
+                {
+                  transaction: t,
+                  replacements: {
+                    id: existingSc.id,
+                    title: sc.title,
+                    description: sc.description || '',
+                    article: scArticle,
+                  },
+                }
+              );
+            } else {
+              await queryInterface.sequelize.query(
+                `INSERT INTO verifywise.subcontrols_struct_eu
+                   (control_id, title, description, order_no, is_demo, article)
+                 VALUES (:controlId, :title, :description, :order_no, false, :article);`,
+                {
+                  transaction: t,
+                  replacements: {
+                    controlId,
+                    title: sc.title,
+                    description: sc.description || '',
+                    order_no: sc.order_no,
+                    article: scArticle,
+                  },
+                }
+              );
+            }
+          }
+        }
+      }
+
+      // Backfill tenant rows for every EU AI Act project that's missing
+      // controls_eu / subcontrols_eu entries for the struct rows above. Catches
+      // up projects provisioned before the new categories were added. No-op on
+      // fresh installs where no projects exist yet.
+      const [ctlBackfill] = await queryInterface.sequelize.query(
+        `INSERT INTO verifywise.controls_eu
+           (organization_id, projects_frameworks_id, control_meta_id)
+         SELECT pf.organization_id, pf.id, cs.id
+         FROM verifywise.projects_frameworks pf
+         CROSS JOIN verifywise.controls_struct_eu cs
+         JOIN verifywise.controlcategories_struct_eu cc ON cc.id = cs.control_category_id
+         WHERE pf.framework_id = :frameworkId
+           AND cc.framework_id = :frameworkId
+           AND NOT EXISTS (
+             SELECT 1 FROM verifywise.controls_eu ce
+             WHERE ce.projects_frameworks_id = pf.id
+               AND ce.control_meta_id = cs.id
+           )
+         RETURNING id;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+
+      const [scBackfill] = await queryInterface.sequelize.query(
+        `INSERT INTO verifywise.subcontrols_eu
+           (organization_id, control_id, subcontrol_meta_id)
+         SELECT pf.organization_id, ce.id, ss.id
+         FROM verifywise.projects_frameworks pf
+         JOIN verifywise.controls_struct_eu cs ON cs.control_category_id IN (
+           SELECT id FROM verifywise.controlcategories_struct_eu
+           WHERE framework_id = :frameworkId
+         )
+         JOIN verifywise.subcontrols_struct_eu ss ON ss.control_id = cs.id
+         JOIN verifywise.controls_eu ce
+           ON ce.projects_frameworks_id = pf.id AND ce.control_meta_id = cs.id
+         WHERE pf.framework_id = :frameworkId
+           AND NOT EXISTS (
+             SELECT 1 FROM verifywise.subcontrols_eu se
+             WHERE se.control_id = ce.id AND se.subcontrol_meta_id = ss.id
+           )
+         RETURNING id;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+
+      console.log(`[reseed-eu-act] reseed complete; tenant backfill: ${ctlBackfill.length} controls_eu, ${scBackfill.length} subcontrols_eu`);
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      DELETE FROM verifywise.controlcategories_struct_eu
+      WHERE framework_id IN (SELECT id FROM verifywise.frameworks WHERE name = 'EU AI Act')
+        AND order_no IN (0, 14, 15, 16, 17, 18);
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260417152215-add-eu-act-roles-risk-tiers-junctions.js b/Servers/database/migrations/20260417152215-add-eu-act-roles-risk-tiers-junctions.js
new file mode 100644
index 0000000000..a41cafecca
--- /dev/null
+++ b/Servers/database/migrations/20260417152215-add-eu-act-roles-risk-tiers-junctions.js
@@ -0,0 +1,150 @@
+'use strict';
+
+/**
+ * Creates the reference tables and category-level junction tables that link
+ * EU AI Act control categories to their applicable roles (Provider / Deployer)
+ * and risk tiers (Prohibited / High risk / Limited risk / Minimal risk / GPAI
+ * / General Risk).
+ *
+ * Tables introduced:
+ *   - verifywise.eu_act_roles
+ *   - verifywise.eu_act_risk_tiers
+ *   - verifywise.controlcategories_struct_eu__roles
+ *   - verifywise.controlcategories_struct_eu__risk_tiers
+ *
+ * Populates junctions from ControlCategories struct so that when the user
+ * fills in `roles` and `riskTiers` on a category, a fresh run of this
+ * migration (or the follow-up backfill migration) lands those links in the
+ * junction tables. Unpopulated categories simply produce no junction rows.
+ *
+ * Controls and subcontrols do NOT have their own junctions — they inherit
+ * their category's role/tier at query time. Add per-control junctions later
+ * if a specific row ever needs to override its category.
+ */
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      // 1. Reference tables ------------------------------------------------
+      await queryInterface.sequelize.query(`
+        CREATE TABLE IF NOT EXISTS verifywise.eu_act_roles (
+          id   SERIAL PRIMARY KEY,
+          name TEXT UNIQUE NOT NULL
+        );
+      `, { transaction: t });
+
+      await queryInterface.sequelize.query(`
+        CREATE TABLE IF NOT EXISTS verifywise.eu_act_risk_tiers (
+          id   SERIAL PRIMARY KEY,
+          name TEXT UNIQUE NOT NULL
+        );
+      `, { transaction: t });
+
+      // 2. Seed reference values ------------------------------------------
+      await queryInterface.sequelize.query(`
+        INSERT INTO verifywise.eu_act_roles (name) VALUES
+          ('Provider'), ('Deployer')
+        ON CONFLICT (name) DO NOTHING;
+      `, { transaction: t });
+
+      await queryInterface.sequelize.query(`
+        INSERT INTO verifywise.eu_act_risk_tiers (name) VALUES
+          ('Prohibited'),
+          ('High risk'),
+          ('Limited risk'),
+          ('Minimal risk'),
+          ('GPAI'),
+          ('General Risk')
+        ON CONFLICT (name) DO NOTHING;
+      `, { transaction: t });
+
+      // 3. Category-level junction tables ---------------------------------
+      await queryInterface.sequelize.query(`
+        CREATE TABLE IF NOT EXISTS verifywise.controlcategories_struct_eu__roles (
+          control_category_id INTEGER NOT NULL
+            REFERENCES verifywise.controlcategories_struct_eu(id) ON DELETE CASCADE,
+          role_id INTEGER NOT NULL
+            REFERENCES verifywise.eu_act_roles(id) ON DELETE CASCADE,
+          PRIMARY KEY (control_category_id, role_id)
+        );
+      `, { transaction: t });
+
+      await queryInterface.sequelize.query(`
+        CREATE TABLE IF NOT EXISTS verifywise.controlcategories_struct_eu__risk_tiers (
+          control_category_id INTEGER NOT NULL
+            REFERENCES verifywise.controlcategories_struct_eu(id) ON DELETE CASCADE,
+          risk_tier_id INTEGER NOT NULL
+            REFERENCES verifywise.eu_act_risk_tiers(id) ON DELETE CASCADE,
+          PRIMARY KEY (control_category_id, risk_tier_id)
+        );
+      `, { transaction: t });
+
+      // 4. Populate junctions from the ControlCategories struct ------------
+      const { ControlCategories } = require('../../dist/structures/EU-AI-Act/compliance-tracker/controlCategories.struct');
+
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'EU AI Act' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[eu-act-junctions] EU AI Act framework not found — skipping junction population');
+        await t.commit();
+        return;
+      }
+
+      for (const category of ControlCategories) {
+        if (!Array.isArray(category.roles) && !Array.isArray(category.riskTiers)) continue;
+
+        const [[catRow]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.controlcategories_struct_eu
+           WHERE framework_id = :frameworkId AND order_no = :order_no
+           LIMIT 1;`,
+          {
+            transaction: t,
+            replacements: { frameworkId: framework.id, order_no: category.order_no },
+          }
+        );
+        if (!catRow?.id) continue;
+
+        for (const roleName of category.roles ?? []) {
+          await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.controlcategories_struct_eu__roles
+               (control_category_id, role_id)
+             SELECT :catId, r.id FROM verifywise.eu_act_roles r WHERE r.name = :roleName
+             ON CONFLICT DO NOTHING;`,
+            {
+              transaction: t,
+              replacements: { catId: catRow.id, roleName },
+            }
+          );
+        }
+
+        for (const tierName of category.riskTiers ?? []) {
+          await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.controlcategories_struct_eu__risk_tiers
+               (control_category_id, risk_tier_id)
+             SELECT :catId, t.id FROM verifywise.eu_act_risk_tiers t WHERE t.name = :tierName
+             ON CONFLICT DO NOTHING;`,
+            {
+              transaction: t,
+              replacements: { catId: catRow.id, tierName },
+            }
+          );
+        }
+      }
+
+      await t.commit();
+      console.log('[eu-act-junctions] junction tables created and populated');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`DROP TABLE IF EXISTS verifywise.controlcategories_struct_eu__risk_tiers;`);
+    await queryInterface.sequelize.query(`DROP TABLE IF EXISTS verifywise.controlcategories_struct_eu__roles;`);
+    await queryInterface.sequelize.query(`DROP TABLE IF EXISTS verifywise.eu_act_risk_tiers;`);
+    await queryInterface.sequelize.query(`DROP TABLE IF EXISTS verifywise.eu_act_roles;`);
+  },
+};
diff --git a/Servers/database/migrations/20260420105041-iso42001-split-clause-6-1.js b/Servers/database/migrations/20260420105041-iso42001-split-clause-6-1.js
new file mode 100644
index 0000000000..a7f53ea478
--- /dev/null
+++ b/Servers/database/migrations/20260420105041-iso42001-split-clause-6-1.js
@@ -0,0 +1,284 @@
+'use strict';
+
+/**
+ * ISO 42001 Clause 6.1 restructure to match the 2023 standard's 3-level shape.
+ *
+ * The original VW seed had one merged 2-level row "6.1 Actions to address
+ * risks and opportunities (Includes Risk Assessment, Treatment, Impact
+ * Assessment)". The standard actually has 6.1.1, 6.1.2, 6.1.3, 6.1.4 as the
+ * real requirements; 6.1 itself is a heading. This migration:
+ *
+ *   1. Deletes the old merged '6.1' struct row. FK ON DELETE CASCADE drops
+ *      every tenant row under it. If any tenant row has real content
+ *      (implementation_description, owner, reviewer, approver, auditor_feedback),
+ *      a warning is logged with the count so anyone running this on non-empty
+ *      data is aware the content was removed by the restructure.
+ *   2. Inserts 4 new struct rows — 6.1.1, 6.1.2, 6.1.3, 6.1.4 — at order_no
+ *      1, 2, 3, 4 (slotting into the space vacated by the deleted 6.1).
+ *   3. Updates 6.2 from order_no 2 → 5.
+ *   4. For every EU AI Act — sorry, ISO 42001 — projects_frameworks row,
+ *      inserts an empty tenant subclause row for each of 6.1.1–6.1.4.
+ *
+ * Clause 6.3 is added by the next migration (20260420105042) at order_no 6.
+ *
+ * Idempotent: SELECTs existing struct rows by (clause_id, subclause_id) before
+ * inserting; renumber runs unconditionally and matches by subclause_id, so
+ * reruns are safe.
+ */
+
+const NEW_SUBCLAUSES = [
+  {
+    subclause_id: '6.1.1',
+    order_no: 1,
+    title: 'General — actions to address risks and opportunities',
+    summary:
+      'When planning for the AIMS, consider the issues from 4.1, requirements from 4.2, and determine risks and opportunities that need to be addressed to ensure the AIMS can achieve its intended outcomes, prevent or reduce undesired effects, and achieve continual improvement.',
+    questions: [
+      'Have we identified risks and opportunities considering the context (4.1) and interested parties (4.2)?',
+      'Do our planned actions integrate into AIMS processes?',
+      'How do we evaluate the effectiveness of these actions?',
+    ],
+    evidence_examples: [
+      'Risk and opportunity register linked to context analysis',
+      'Planning records showing integration into AIMS processes',
+      'Effectiveness evaluation records',
+    ],
+  },
+  {
+    subclause_id: '6.1.2',
+    order_no: 2,
+    title: 'AI risk assessment',
+    summary:
+      'Define and apply an AI risk assessment process that establishes risk criteria, identifies risks to individuals, groups, and societies from AI systems, analyzes and evaluates those risks, and selects treatment options.',
+    questions: [
+      'Is there a documented AI risk assessment methodology with defined risk criteria?',
+      'Are risks to individuals, groups, and societies from AI systems systematically identified?',
+      'How are identified risks analyzed (likelihood, severity, affected parties)?',
+      'How are risks evaluated against acceptance criteria?',
+    ],
+    evidence_examples: [
+      'AI risk assessment methodology document',
+      'Risk criteria definitions (likelihood scales, impact scales, acceptance thresholds)',
+      'AI risk assessment reports per system',
+      'Risk register with analysis and evaluation results',
+    ],
+  },
+  {
+    subclause_id: '6.1.3',
+    order_no: 3,
+    title: 'AI risk treatment',
+    summary:
+      'Define and apply an AI risk treatment process to select appropriate treatment options, determine controls (referencing Annex A), produce a Statement of Applicability, and formulate a risk treatment plan.',
+    questions: [
+      'How are risk treatment options selected for each identified AI risk?',
+      'Is there a Statement of Applicability (SoA) documenting which Annex A controls apply and which are excluded with justification?',
+      'Is there a documented risk treatment plan with owners, timelines, and resources?',
+      'Have risk owners approved the risk treatment plan and accepted residual risks?',
+    ],
+    evidence_examples: [
+      'AI risk treatment plan',
+      'Statement of Applicability (SoA)',
+      'Risk owner approval records',
+      'Residual risk acceptance documentation',
+    ],
+  },
+  {
+    subclause_id: '6.1.4',
+    order_no: 4,
+    title: 'AI system impact assessment',
+    summary:
+      'Define and apply an AI system impact assessment process to assess potential consequences — positive and negative — of AI systems on individuals, groups, and societies, considering the AI system lifecycle.',
+    questions: [
+      'Is there a documented impact assessment methodology for AI systems?',
+      'Are both positive and negative impacts on individuals, groups, and societies assessed?',
+      'At which lifecycle stages are impact assessments conducted or updated?',
+      'How are impact assessment results fed into risk treatment and system design decisions?',
+    ],
+    evidence_examples: [
+      'AI impact assessment methodology',
+      'Completed impact assessment reports per AI system',
+      'Records linking impact findings to design or treatment decisions',
+    ],
+  },
+];
+
+const toPgArray = (arr) => {
+  if (!arr || !Array.isArray(arr) || arr.length === 0) return '{}';
+  const escaped = arr.map(v => `"${String(v).replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`);
+  return `{${escaped.join(',')}}`;
+};
+
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks
+         WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+         LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[iso42001-split-6.1] ISO 42001 framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      const [[clause6]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.clauses_struct_iso
+         WHERE framework_id = :frameworkId AND clause_no = 6
+         LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      if (!clause6) {
+        console.warn('[iso42001-split-6.1] Clause 6 not found — skipping');
+        await t.commit();
+        return;
+      }
+      const clauseId = clause6.id;
+
+      // 1) Delete the old merged 6.1 row if still present. FK ON DELETE CASCADE
+      //    drops every tenant row under it. If any tenant row has real content,
+      //    log a warning with the count — this restructure removes that content
+      //    on purpose because old 6.1 is being replaced by 6.1.1–6.1.4.
+      const [[oldSixOne]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.subclauses_struct_iso
+         WHERE clause_id = :clauseId AND subclause_id = '6.1' LIMIT 1;`,
+        { transaction: t, replacements: { clauseId } }
+      );
+
+      if (oldSixOne?.id) {
+        const [[conflict]] = await queryInterface.sequelize.query(
+          `SELECT COUNT(*) AS n
+           FROM verifywise.subclauses_iso
+           WHERE subclause_meta_id = :structId
+             AND (implementation_description IS NOT NULL
+                  OR owner IS NOT NULL
+                  OR reviewer IS NOT NULL
+                  OR approver IS NOT NULL
+                  OR auditor_feedback IS NOT NULL);`,
+          { transaction: t, replacements: { structId: oldSixOne.id } }
+        );
+
+        if (Number(conflict.n) > 0) {
+          console.warn(
+            `[iso42001-split-6.1] old merged '6.1' has ${conflict.n} tenant row(s) with content — these will be removed by CASCADE (replaced by 6.1.1–6.1.4)`
+          );
+        }
+
+        await queryInterface.sequelize.query(
+          `DELETE FROM verifywise.subclauses_struct_iso WHERE id = :id;`,
+          { transaction: t, replacements: { id: oldSixOne.id } }
+        );
+        console.log('[iso42001-split-6.1] deleted old merged 6.1 struct row');
+      }
+
+      // 2) Update 6.2 from order_no 2 → 5 before inserting the new children,
+      //    so there's no ambiguity on order_no lookups.
+      await queryInterface.sequelize.query(
+        `UPDATE verifywise.subclauses_struct_iso
+           SET order_no = 5
+         WHERE clause_id = :clauseId AND subclause_id = '6.2';`,
+        { transaction: t, replacements: { clauseId } }
+      );
+
+      // 3) Insert the 4 new struct rows, idempotent by (clause_id, subclause_id)
+      const newStructIds = [];
+      for (const sub of NEW_SUBCLAUSES) {
+        const [[existing]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.subclauses_struct_iso
+           WHERE clause_id = :clauseId AND subclause_id = :subclause_id
+           LIMIT 1;`,
+          { transaction: t, replacements: { clauseId, subclause_id: sub.subclause_id } }
+        );
+        let structId = existing?.id;
+        if (structId) {
+          // Rerun: ensure order_no is the final canonical value
+          await queryInterface.sequelize.query(
+            `UPDATE verifywise.subclauses_struct_iso
+               SET order_no = :order_no
+             WHERE id = :id;`,
+            { transaction: t, replacements: { id: structId, order_no: sub.order_no } }
+          );
+        } else {
+          const [[inserted]] = await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.subclauses_struct_iso
+               (clause_id, subclause_id, title, summary, questions, evidence_examples, order_no, is_demo)
+             VALUES
+               (:clauseId, :subclause_id, :title, :summary, :questions, :evidence_examples, :order_no, false)
+             RETURNING id;`,
+            {
+              transaction: t,
+              replacements: {
+                clauseId,
+                subclause_id: sub.subclause_id,
+                title: sub.title,
+                summary: sub.summary,
+                questions: toPgArray(sub.questions),
+                evidence_examples: toPgArray(sub.evidence_examples),
+                order_no: sub.order_no,
+              },
+            }
+          );
+          structId = inserted.id;
+        }
+        newStructIds.push(structId);
+      }
+
+      // 4) For every projects_frameworks row tied to this ISO 42001 framework,
+      //    insert 4 empty tenant rows — one per new struct row. Idempotent via
+      //    NOT EXISTS.
+      for (const structId of newStructIds) {
+        await queryInterface.sequelize.query(
+          `INSERT INTO verifywise.subclauses_iso
+             (organization_id, projects_frameworks_id, subclause_meta_id, status)
+           SELECT pf.organization_id, pf.id, :structId, 'Not started'
+           FROM verifywise.projects_frameworks pf
+           WHERE pf.framework_id = :frameworkId
+             AND NOT EXISTS (
+               SELECT 1 FROM verifywise.subclauses_iso si
+               WHERE si.projects_frameworks_id = pf.id
+                 AND si.subclause_meta_id = :structId
+             );`,
+          { transaction: t, replacements: { structId, frameworkId } }
+        );
+      }
+
+      await t.commit();
+      console.log('[iso42001-split-6.1] clause 6 restructured to 6.1.1-6.1.4 + renumbered 6.2 → 5');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    // Remove the 4 new struct rows; FK ON DELETE CASCADE cleans up tenant rows.
+    // Does NOT recreate the old merged 6.1 — that was the deliberate fix.
+    await queryInterface.sequelize.query(`
+      DELETE FROM verifywise.subclauses_struct_iso
+      WHERE subclause_id IN ('6.1.1', '6.1.2', '6.1.3', '6.1.4')
+        AND clause_id IN (
+          SELECT id FROM verifywise.clauses_struct_iso
+          WHERE clause_no = 6
+            AND framework_id IN (
+              SELECT id FROM verifywise.frameworks
+              WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+            )
+        );
+
+      UPDATE verifywise.subclauses_struct_iso
+         SET order_no = 2
+       WHERE subclause_id = '6.2'
+         AND clause_id IN (
+           SELECT id FROM verifywise.clauses_struct_iso
+           WHERE clause_no = 6
+             AND framework_id IN (
+               SELECT id FROM verifywise.frameworks
+               WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+             )
+         );
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260420105042-iso42001-add-clause-6-3.js b/Servers/database/migrations/20260420105042-iso42001-add-clause-6-3.js
new file mode 100644
index 0000000000..39a1ad912e
--- /dev/null
+++ b/Servers/database/migrations/20260420105042-iso42001-add-clause-6-3.js
@@ -0,0 +1,133 @@
+'use strict';
+
+/**
+ * ISO 42001 Clause 6.3 "Planning of changes" — missing from the VW seed.
+ *
+ * Adds one new subclause under clause 6. For every organization that has an
+ * ISO 42001 project, inserts an empty tenant row so the new subclause shows up
+ * unfilled in the tracker.
+ *
+ * Idempotent: struct INSERT is skipped if a row with the same clause_id +
+ * subclause_id already exists; tenant INSERTs skip pairs that already exist.
+ */
+
+const NEW_SUBCLAUSE = {
+  subclause_id: '6.3',
+  order_no: 6,
+  title: 'Planning of changes',
+  summary:
+    'When the organization determines the need for changes to the AIMS, the changes shall be carried out in a planned manner.',
+  questions: [
+    'Is there a defined process for planning changes to the AIMS?',
+    'Are changes assessed for their impact on AIMS integrity, AI risk assessments, and the Statement of Applicability before implementation?',
+    'Are responsibilities, timelines, and resources for changes documented?',
+  ],
+  evidence_examples: [
+    'Change management procedure for the AIMS',
+    'Change request and impact assessment records',
+    'Approval records for AIMS changes',
+    'Post-change review records',
+  ],
+};
+
+const toPgArray = (arr) => {
+  if (!arr || !Array.isArray(arr) || arr.length === 0) return '{}';
+  const escaped = arr.map(v => `"${String(v).replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`);
+  return `{${escaped.join(',')}}`;
+};
+
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks
+         WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+         LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[iso42001-6.3] ISO 42001 framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      const [[clause6]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.clauses_struct_iso
+         WHERE framework_id = :frameworkId AND clause_no = 6 LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      if (!clause6) {
+        console.warn('[iso42001-6.3] Clause 6 not found — skipping');
+        await t.commit();
+        return;
+      }
+      const clauseId = clause6.id;
+
+      // Upsert struct row
+      const [[existing]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.subclauses_struct_iso
+         WHERE clause_id = :clauseId AND subclause_id = :subclause_id LIMIT 1;`,
+        { transaction: t, replacements: { clauseId, subclause_id: NEW_SUBCLAUSE.subclause_id } }
+      );
+      let structId = existing?.id;
+      if (!structId) {
+        const [[inserted]] = await queryInterface.sequelize.query(
+          `INSERT INTO verifywise.subclauses_struct_iso
+             (clause_id, subclause_id, title, summary, questions, evidence_examples, order_no, is_demo)
+           VALUES (:clauseId, :subclause_id, :title, :summary, :questions, :evidence_examples, :order_no, false)
+           RETURNING id;`,
+          {
+            transaction: t,
+            replacements: {
+              clauseId,
+              subclause_id: NEW_SUBCLAUSE.subclause_id,
+              title: NEW_SUBCLAUSE.title,
+              summary: NEW_SUBCLAUSE.summary,
+              questions: toPgArray(NEW_SUBCLAUSE.questions),
+              evidence_examples: toPgArray(NEW_SUBCLAUSE.evidence_examples),
+              order_no: NEW_SUBCLAUSE.order_no,
+            },
+          }
+        );
+        structId = inserted.id;
+      }
+
+      // Empty tenant row per ISO 42001 projects_frameworks
+      await queryInterface.sequelize.query(
+        `INSERT INTO verifywise.subclauses_iso
+           (organization_id, projects_frameworks_id, subclause_meta_id, status)
+         SELECT pf.organization_id, pf.id, :structId, 'Not started'
+         FROM verifywise.projects_frameworks pf
+         WHERE pf.framework_id = :frameworkId
+           AND NOT EXISTS (
+             SELECT 1 FROM verifywise.subclauses_iso si
+             WHERE si.projects_frameworks_id = pf.id AND si.subclause_meta_id = :structId
+           );`,
+        { transaction: t, replacements: { structId, frameworkId } }
+      );
+
+      await t.commit();
+      console.log('[iso42001-6.3] added Planning of changes subclause + empty tenant rows');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      DELETE FROM verifywise.subclauses_struct_iso
+      WHERE subclause_id = '6.3'
+        AND clause_id IN (
+          SELECT id FROM verifywise.clauses_struct_iso
+          WHERE clause_no = 6
+            AND framework_id IN (
+              SELECT id FROM verifywise.frameworks
+              WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+            )
+        );
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260420105043-iso42001-remove-phantom-8-5.js b/Servers/database/migrations/20260420105043-iso42001-remove-phantom-8-5.js
new file mode 100644
index 0000000000..036dbe0da6
--- /dev/null
+++ b/Servers/database/migrations/20260420105043-iso42001-remove-phantom-8-5.js
@@ -0,0 +1,35 @@
+'use strict';
+
+/**
+ * ISO 42001 phantom subclause 8.5 "Third-party relationships" removal.
+ *
+ * The ISO 42001 standard's clause 8 only goes to 8.4 (AI system lifecycle).
+ * VW seeded an extra 8.5 "Third-party relationships" that does not exist in the
+ * standard — the same content is already covered by Annex A.11 (VW A.11 /
+ * ISO A.8).
+ *
+ * This migration deletes the struct row; ON DELETE CASCADE on
+ * subclauses_iso.subclause_meta_id_fkey cleans up tenant rows. Any tenant
+ * answers attached to the phantom 8.5 are lost — acceptable because the
+ * category duplicates Annex A.11 where they can re-apply the content.
+ */
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.sequelize.query(`
+      DELETE FROM verifywise.subclauses_struct_iso
+      WHERE subclause_id = '8.5'
+        AND clause_id IN (
+          SELECT id FROM verifywise.clauses_struct_iso
+          WHERE clause_no = 8
+            AND framework_id IN (
+              SELECT id FROM verifywise.frameworks
+              WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+            )
+        );
+    `);
+  },
+
+  async down() {
+    // Intentionally no-op: we don't recreate content that doesn't exist in the standard.
+  },
+};
diff --git a/Servers/database/migrations/20260420105044-iso42001-add-annex-a-12-a-13.js b/Servers/database/migrations/20260420105044-iso42001-add-annex-a-12-a-13.js
new file mode 100644
index 0000000000..1e0d537e15
--- /dev/null
+++ b/Servers/database/migrations/20260420105044-iso42001-add-annex-a-12-a-13.js
@@ -0,0 +1,177 @@
+'use strict';
+
+/**
+ * ISO 42001 Annex A.12 (Interested parties) and A.13 (Use of AI systems) —
+ * both annex groups were missing from VW. Each ships with three sub-controls.
+ *
+ * Per user approach: add new struct rows; for every organization with an ISO
+ * 42001 project, insert empty tenant rows so the groups surface unfilled in
+ * the tracker.
+ *
+ * Idempotent via EXISTS guards.
+ */
+
+const A12_INTERESTED_PARTIES = [
+  {
+    sub_id: 1.1,
+    order_no: 1,
+    title: 'Notification to interested parties',
+    description: 'Notifying affected individuals and relevant parties about AI system use and its potential impacts.',
+    guidance: 'The organization should establish processes for notifying interested parties about AI system deployment, its purpose, and potential impacts on them, in accordance with applicable legal, regulatory, and contractual requirements.',
+  },
+  {
+    sub_id: 2.1,
+    order_no: 2,
+    title: 'Communication with interested parties',
+    description: 'Establishing effective communication channels with interested parties regarding AI systems.',
+    guidance: 'The organization should establish and maintain communication channels that allow interested parties to raise questions, provide feedback, and receive information about the organization\'s AI systems and their governance.',
+  },
+  {
+    sub_id: 3.1,
+    order_no: 3,
+    title: "Addressing interested parties' concerns",
+    description: 'Processes for receiving, evaluating, and responding to concerns raised by interested parties about AI systems.',
+    guidance: 'The organization should establish processes for receiving, recording, evaluating, and responding to concerns raised by interested parties regarding the development, deployment, or operation of AI systems, including mechanisms for escalation and resolution.',
+  },
+];
+
+const A13_USE_OF_AI_SYSTEMS = [
+  {
+    sub_id: 1.1,
+    order_no: 1,
+    title: 'Responsible use of AI',
+    description: 'Ensuring AI systems are used responsibly and in accordance with organizational policies and ethical principles.',
+    guidance: 'The organization should establish policies and procedures to ensure AI systems are used responsibly, including appropriate human oversight, monitoring of outcomes, and adherence to ethical principles and organizational AI policy throughout operation.',
+  },
+  {
+    sub_id: 2.1,
+    order_no: 2,
+    title: 'Intended use documentation',
+    description: 'Documenting the intended purpose, conditions of use, and known limitations of AI systems.',
+    guidance: 'The intended purpose, operational conditions, known limitations, and boundaries of each AI system should be clearly documented and communicated to users and operators to prevent misuse and ensure appropriate application.',
+  },
+  {
+    sub_id: 3.1,
+    order_no: 3,
+    title: 'Transparency for users of AI systems',
+    description: 'Providing users with clear information about AI system behavior, capabilities, and limitations.',
+    guidance: 'Users of AI systems should be provided with clear, accessible information about how the AI system works, what it can and cannot do, the basis for its outputs, and how to interpret results, appropriate to the user\'s role and context.',
+  },
+];
+
+async function upsertAnnexGroup(queryInterface, t, { frameworkId, annex_no, title, items }) {
+  // Upsert annex group
+  const [[existing]] = await queryInterface.sequelize.query(
+    `SELECT id FROM verifywise.annex_struct_iso
+     WHERE framework_id = :frameworkId AND annex_no = :annex_no LIMIT 1;`,
+    { transaction: t, replacements: { frameworkId, annex_no } }
+  );
+  let annexId = existing?.id;
+  if (!annexId) {
+    const [[inserted]] = await queryInterface.sequelize.query(
+      `INSERT INTO verifywise.annex_struct_iso (framework_id, title, annex_no, order_no, is_demo)
+       VALUES (:frameworkId, :title, :annex_no, :annex_no, false)
+       RETURNING id;`,
+      { transaction: t, replacements: { frameworkId, title, annex_no } }
+    );
+    annexId = inserted.id;
+  }
+
+  // Upsert sub-controls
+  const structIds = [];
+  for (const item of items) {
+    const [[existingSub]] = await queryInterface.sequelize.query(
+      `SELECT id FROM verifywise.annexcategories_struct_iso
+       WHERE annex_id = :annexId AND order_no = :order_no LIMIT 1;`,
+      { transaction: t, replacements: { annexId, order_no: item.order_no } }
+    );
+    let structId = existingSub?.id;
+    if (!structId) {
+      const [[inserted]] = await queryInterface.sequelize.query(
+        `INSERT INTO verifywise.annexcategories_struct_iso
+           (annex_id, sub_id, title, description, guidance, order_no, is_demo)
+         VALUES (:annexId, :sub_id, :title, :description, :guidance, :order_no, false)
+         RETURNING id;`,
+        {
+          transaction: t,
+          replacements: {
+            annexId,
+            sub_id: item.sub_id,
+            title: item.title,
+            description: item.description,
+            guidance: item.guidance,
+            order_no: item.order_no,
+          },
+        }
+      );
+      structId = inserted.id;
+    }
+    structIds.push(structId);
+  }
+
+  // Empty tenant rows for every ISO 42001 projects_frameworks row
+  for (const structId of structIds) {
+    await queryInterface.sequelize.query(
+      `INSERT INTO verifywise.annexcategories_iso
+         (organization_id, projects_frameworks_id, annexcategory_meta_id, status, is_applicable)
+       SELECT pf.organization_id, pf.id, :structId, 'Not started', true
+       FROM verifywise.projects_frameworks pf
+       WHERE pf.framework_id = :frameworkId
+         AND NOT EXISTS (
+           SELECT 1 FROM verifywise.annexcategories_iso ai
+           WHERE ai.projects_frameworks_id = pf.id
+             AND ai.annexcategory_meta_id = :structId
+         );`,
+      { transaction: t, replacements: { structId, frameworkId } }
+    );
+  }
+}
+
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks
+         WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[iso42001-a12-a13] ISO 42001 framework not found — skipping');
+        await t.commit();
+        return;
+      }
+
+      await upsertAnnexGroup(queryInterface, t, {
+        frameworkId: framework.id,
+        annex_no: 12,
+        title: 'A.12 Interested parties',
+        items: A12_INTERESTED_PARTIES,
+      });
+
+      await upsertAnnexGroup(queryInterface, t, {
+        frameworkId: framework.id,
+        annex_no: 13,
+        title: 'A.13 Use of AI systems',
+        items: A13_USE_OF_AI_SYSTEMS,
+      });
+
+      await t.commit();
+      console.log('[iso42001-a12-a13] annex groups A.12 and A.13 added + empty tenant rows');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      DELETE FROM verifywise.annex_struct_iso
+      WHERE annex_no IN (12, 13)
+        AND framework_id IN (
+          SELECT id FROM verifywise.frameworks
+          WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+        );
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260420105045-iso42001-add-a9-data-sub-controls.js b/Servers/database/migrations/20260420105045-iso42001-add-a9-data-sub-controls.js
new file mode 100644
index 0000000000..ac6ea5c145
--- /dev/null
+++ b/Servers/database/migrations/20260420105045-iso42001-add-a9-data-sub-controls.js
@@ -0,0 +1,147 @@
+'use strict';
+
+/**
+ * Adds 5 missing sub-controls to ISO 42001 Annex A.9 "Data for AI systems"
+ * (VW A.9 / ISO A.6): labeling, bias assessment, retention, deletion, transfer.
+ *
+ * For every organization with an ISO 42001 project, inserts an empty tenant row
+ * per new sub-control so the controls surface unfilled in the tracker.
+ * Idempotent via EXISTS guards.
+ */
+
+const NEW_SUB_CONTROLS = [
+  {
+    sub_id: 7.1,
+    order_no: 7,
+    title: 'Data labeling and annotation',
+    description: 'Managing data labeling and annotation processes for AI systems.',
+    guidance: 'Data labeling and annotation processes should be defined, documented, and quality-controlled to ensure labels are accurate, consistent, and appropriate for the intended AI system purpose. Labeler qualifications and inter-annotator agreement should be monitored.',
+  },
+  {
+    sub_id: 8.1,
+    order_no: 8,
+    title: 'Data bias assessment',
+    description: 'Assessing and mitigating bias in data used for AI systems.',
+    guidance: 'Data used for AI systems should be assessed for potential biases that could lead to unfair, discriminatory, or harmful outcomes. Identified biases should be documented and mitigated through appropriate techniques.',
+  },
+  {
+    sub_id: 9.1,
+    order_no: 9,
+    title: 'Data retention',
+    description: 'Defining and implementing data retention policies for AI-related data.',
+    guidance: 'Retention periods for data used in AI systems — including training data, validation data, model outputs, and logs — should be defined based on legal, regulatory, and operational requirements, and enforced through documented procedures.',
+  },
+  {
+    sub_id: 10.1,
+    order_no: 10,
+    title: 'Data deletion and disposal',
+    description: 'Secure deletion and disposal of AI-related data.',
+    guidance: 'Data used in AI systems should be securely deleted or disposed of when no longer needed or when retention periods expire, ensuring that deletion is complete and verifiable, particularly for personal or sensitive data.',
+  },
+  {
+    sub_id: 11.1,
+    order_no: 11,
+    title: 'Data transfer',
+    description: 'Managing the transfer of data used in AI systems.',
+    guidance: 'Transfer of data used in AI systems — whether internal or to third parties — should be governed by documented procedures addressing authorization, encryption, contractual safeguards, and compliance with data protection regulations including cross-border transfer restrictions.',
+  },
+];
+
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks
+         WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[iso42001-a9-subcontrols] ISO 42001 framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      const [[annex]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.annex_struct_iso
+         WHERE framework_id = :frameworkId AND annex_no = 9 LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      if (!annex) {
+        console.warn('[iso42001-a9-subcontrols] A.9 annex group not found — skipping');
+        await t.commit();
+        return;
+      }
+      const annexId = annex.id;
+
+      const structIds = [];
+      for (const sub of NEW_SUB_CONTROLS) {
+        const [[existing]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.annexcategories_struct_iso
+           WHERE annex_id = :annexId AND order_no = :order_no LIMIT 1;`,
+          { transaction: t, replacements: { annexId, order_no: sub.order_no } }
+        );
+        let structId = existing?.id;
+        if (!structId) {
+          const [[inserted]] = await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.annexcategories_struct_iso
+               (annex_id, sub_id, title, description, guidance, order_no, is_demo)
+             VALUES (:annexId, :sub_id, :title, :description, :guidance, :order_no, false)
+             RETURNING id;`,
+            {
+              transaction: t,
+              replacements: {
+                annexId,
+                sub_id: sub.sub_id,
+                title: sub.title,
+                description: sub.description,
+                guidance: sub.guidance,
+                order_no: sub.order_no,
+              },
+            }
+          );
+          structId = inserted.id;
+        }
+        structIds.push(structId);
+      }
+
+      for (const structId of structIds) {
+        await queryInterface.sequelize.query(
+          `INSERT INTO verifywise.annexcategories_iso
+             (organization_id, projects_frameworks_id, annexcategory_meta_id, status, is_applicable)
+           SELECT pf.organization_id, pf.id, :structId, 'Not started', true
+           FROM verifywise.projects_frameworks pf
+           WHERE pf.framework_id = :frameworkId
+             AND NOT EXISTS (
+               SELECT 1 FROM verifywise.annexcategories_iso ai
+               WHERE ai.projects_frameworks_id = pf.id
+                 AND ai.annexcategory_meta_id = :structId
+             );`,
+          { transaction: t, replacements: { structId, frameworkId } }
+        );
+      }
+
+      await t.commit();
+      console.log('[iso42001-a9-subcontrols] added 5 A.9 sub-controls + empty tenant rows');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      DELETE FROM verifywise.annexcategories_struct_iso
+      WHERE order_no IN (7, 8, 9, 10, 11)
+        AND annex_id IN (
+          SELECT id FROM verifywise.annex_struct_iso
+          WHERE annex_no = 9
+            AND framework_id IN (
+              SELECT id FROM verifywise.frameworks
+              WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+            )
+        );
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260420105046-iso42001-dedupe-a5-move-to-a6.js b/Servers/database/migrations/20260420105046-iso42001-dedupe-a5-move-to-a6.js
new file mode 100644
index 0000000000..42282c6574
--- /dev/null
+++ b/Servers/database/migrations/20260420105046-iso42001-dedupe-a5-move-to-a6.js
@@ -0,0 +1,148 @@
+'use strict';
+
+/**
+ * ISO 42001 Annex re-scope: de-duplicate A.5 and reparent items that belong
+ * under A.6 (ISO A.3 — Internal organization).
+ *
+ * DELETE from A.5:
+ *   - "AI roles and responsibilities" (duplicate of A.6.1.1)
+ *   - "Segregation of duties" (duplicate of A.6.1.2)
+ *
+ * REPARENT from A.5 → A.6 (preserves tenant answers; only annex_id changes):
+ *   - "Accountability for AI systems"
+ *   - "Contact with authorities"
+ *   - "Contact with special interest groups"
+ *   - "AI in project management"
+ *
+ * Also resets is_applicable to true and clears justification_for_exclusion on
+ * the reparented rows (struct-file defaults should be applicable=true; each
+ * tenant decides).
+ */
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks
+         WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[iso42001-dedupe] ISO 42001 framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      const [[annex5]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.annex_struct_iso WHERE framework_id = :frameworkId AND annex_no = 5 LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      const [[annex6]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.annex_struct_iso WHERE framework_id = :frameworkId AND annex_no = 6 LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      if (!annex5?.id || !annex6?.id) {
+        console.warn('[iso42001-dedupe] A.5 or A.6 annex group missing — skipping');
+        await t.commit();
+        return;
+      }
+
+      // 1. DELETE true duplicates from A.5 (cascades tenant answers)
+      await queryInterface.sequelize.query(
+        `DELETE FROM verifywise.annexcategories_struct_iso
+         WHERE annex_id = :annex5Id
+           AND title IN ('AI roles and responsibilities', 'Segregation of duties');`,
+        { transaction: t, replacements: { annex5Id: annex5.id } }
+      );
+
+      // 2. REPARENT the 4 misplaced items to A.6 (preserves tenant answers).
+      //    Also reset is_applicable defaults and reassign order_no in A.6.
+      const toMove = [
+        { title: 'Accountability for AI systems', sub_id: 2.1, order_no: 3 },
+        { title: 'Contact with authorities', sub_id: 3.1, order_no: 4 },
+        { title: 'Contact with special interest groups', sub_id: 3.2, order_no: 5 },
+        { title: 'AI in project management', sub_id: 4.1, order_no: 6 },
+      ];
+      for (const item of toMove) {
+        await queryInterface.sequelize.query(
+          `UPDATE verifywise.annexcategories_struct_iso
+             SET annex_id = :annex6Id,
+                 sub_id = :sub_id,
+                 order_no = :order_no
+           WHERE annex_id = :annex5Id AND title = :title;`,
+          {
+            transaction: t,
+            replacements: {
+              annex5Id: annex5.id,
+              annex6Id: annex6.id,
+              sub_id: item.sub_id,
+              order_no: item.order_no,
+              title: item.title,
+            },
+          }
+        );
+      }
+
+      await t.commit();
+      console.log('[iso42001-dedupe] A.5 duplicates removed; 4 items reparented to A.6');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks
+         WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) { await t.commit(); return; }
+      const frameworkId = framework.id;
+
+      const [[annex5]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.annex_struct_iso WHERE framework_id = :frameworkId AND annex_no = 5 LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      const [[annex6]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.annex_struct_iso WHERE framework_id = :frameworkId AND annex_no = 6 LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      if (!annex5?.id || !annex6?.id) { await t.commit(); return; }
+
+      // Reverse the reparenting
+      const toRestore = [
+        { title: 'Accountability for AI systems', sub_id: 4.1, order_no: 5 },
+        { title: 'Contact with authorities', sub_id: 5.1, order_no: 6 },
+        { title: 'Contact with special interest groups', sub_id: 5.2, order_no: 7 },
+        { title: 'AI in project management', sub_id: 6.1, order_no: 8 },
+      ];
+      for (const item of toRestore) {
+        await queryInterface.sequelize.query(
+          `UPDATE verifywise.annexcategories_struct_iso
+             SET annex_id = :annex5Id, sub_id = :sub_id, order_no = :order_no
+           WHERE annex_id = :annex6Id AND title = :title;`,
+          {
+            transaction: t,
+            replacements: {
+              annex5Id: annex5.id,
+              annex6Id: annex6.id,
+              sub_id: item.sub_id,
+              order_no: item.order_no,
+              title: item.title,
+            },
+          }
+        );
+      }
+      // Note: we do not recreate the deleted duplicates — they were intentionally dropped.
+
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+};
diff --git a/Servers/database/migrations/20260420105047-iso42001-misc-title-fixes.js b/Servers/database/migrations/20260420105047-iso42001-misc-title-fixes.js
new file mode 100644
index 0000000000..c9ae742c1f
--- /dev/null
+++ b/Servers/database/migrations/20260420105047-iso42001-misc-title-fixes.js
@@ -0,0 +1,42 @@
+'use strict';
+
+/**
+ * Miscellaneous ISO 42001 struct-row title fixes applied to the DB so existing
+ * installs match the updated struct files:
+ *   - Clause 8.4 "AI System Lifecycle" → "AI system lifecycle" (sentence case)
+ */
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.sequelize.query(`
+      UPDATE verifywise.subclauses_struct_iso
+         SET title = 'AI system lifecycle'
+       WHERE subclause_id = '8.4'
+         AND title = 'AI System Lifecycle'
+         AND clause_id IN (
+           SELECT id FROM verifywise.clauses_struct_iso
+           WHERE clause_no = 8
+             AND framework_id IN (
+               SELECT id FROM verifywise.frameworks
+               WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+             )
+         );
+    `);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      UPDATE verifywise.subclauses_struct_iso
+         SET title = 'AI System Lifecycle'
+       WHERE subclause_id = '8.4'
+         AND title = 'AI system lifecycle'
+         AND clause_id IN (
+           SELECT id FROM verifywise.clauses_struct_iso
+           WHERE clause_no = 8
+             AND framework_id IN (
+               SELECT id FROM verifywise.frameworks
+               WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+             )
+         );
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260420113913-iso27001-align-to-2022-standard.js b/Servers/database/migrations/20260420113913-iso27001-align-to-2022-standard.js
new file mode 100644
index 0000000000..e04688b9b1
--- /dev/null
+++ b/Servers/database/migrations/20260420113913-iso27001-align-to-2022-standard.js
@@ -0,0 +1,407 @@
+'use strict';
+
+const toPgArray = (arr) => {
+  if (!arr || !Array.isArray(arr) || arr.length === 0) return '{}';
+  const escaped = arr.map(v => `"${String(v).replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`);
+  return `{${escaped.join(',')}}`;
+};
+
+/**
+ * ISO 27001 — bring VW's struct tables in line with ISO/IEC 27001:2022
+ * Annex A and Clause 6.
+ *
+ * Source of truth: ISO/IEC 27001:2022 published standard (not the developer
+ * brief; the brief has internal contradictions for Annex A.8 where multiple
+ * entries map to "Use of cryptography" — resolved here by using the standard).
+ *
+ * Changes applied in one transaction:
+ *
+ *   CLAUSE 6
+ *     • Rename the two existing rows tagged subclause_id='6.1' to '6.1.2'
+ *       (Information security risk assessment) and '6.1.3' (Information
+ *       security risk treatment). Preserves tenant answers via UPDATE.
+ *     • INSERT new 6.1.1 "General" and 6.3 "Planning of changes" subclauses.
+ *     • INSERT an empty tenant row per ISO 27001 projects_frameworks for each
+ *       new subclause.
+ *
+ *   ANNEX A.5 (Organizational controls)
+ *     • Minor wording on A.5.9, A.5.10 (add "other associated").
+ *     • Rename A.5.14 through A.5.36 (23 controls) to 2022 titles.
+ *     • INSERT A.5.37 "Documented operating procedures" + empty tenant rows.
+ *
+ *   ANNEX A.6 (People controls)
+ *     • Rename A.6.5, A.6.6, A.6.7, A.6.8 to 2022 order/titles.
+ *
+ *   ANNEX A.7 (Physical controls)
+ *     • Rename A.7.4 through A.7.14 to 2022 titles (A.7.8 unchanged).
+ *
+ *   ANNEX A.8 (Technological controls)
+ *     • Rename A.8.3 through A.8.31 to 2022 titles (A.8.1, A.8.2 unchanged).
+ *     • DELETE phantom A.8.32-A.8.35 "Network service security …" controls.
+ *       Tenant answers on these phantom rows cascade — acceptable, they were
+ *       never part of the 2022 standard.
+ *     • INSERT real 2022 A.8.32 "Change management", A.8.33 "Test information",
+ *       A.8.34 "Protection of information systems during audit testing" with
+ *       empty tenant rows per project.
+ *
+ * All UPDATE / INSERT / DELETE operations run in one transaction. Idempotent
+ * via NOT EXISTS guards on tenant-row INSERTs.
+ */
+
+// Old title → new 2022 title. Uses old titles as UPDATE target to avoid
+// depending on control_id character values.
+const ANNEX_RENAMES = [
+  // A.5 wording
+  { annex: 5, oldTitle: 'Inventory of information and assets', newTitle: 'Inventory of information and other associated assets' },
+  { annex: 5, oldTitle: 'Acceptable use of information and assets', newTitle: 'Acceptable use of information and other associated assets' },
+  // A.5.14 – A.5.36 renumber to 2022 titles
+  { annex: 5, oldTitle: 'Handling of information', newTitle: 'Information transfer' },
+  { annex: 5, oldTitle: 'Access control policy', newTitle: 'Access control' },
+  { annex: 5, oldTitle: 'Access to networks and network services', newTitle: 'Identity management' },
+  { annex: 5, oldTitle: 'User registration and de-registration', newTitle: 'Authentication information' },
+  { annex: 5, oldTitle: 'Management of privileged access rights', newTitle: 'Access rights' },
+  { annex: 5, oldTitle: 'Management of secret authentication information', newTitle: 'Information security in supplier relationships' },
+  { annex: 5, oldTitle: 'Review of user access rights', newTitle: 'Addressing information security within supplier agreements' },
+  { annex: 5, oldTitle: 'Removal or adjustment of access rights', newTitle: 'Managing information security in the ICT supply chain' },
+  { annex: 5, oldTitle: 'Use of secret authentication information', newTitle: 'Monitoring, review and change management of supplier services' },
+  { annex: 5, oldTitle: 'Information security in supplier relationships', newTitle: 'Information security for use of cloud services' },
+  { annex: 5, oldTitle: 'Addressing information security within supplier agreements', newTitle: 'Information security incident management planning and preparation' },
+  { annex: 5, oldTitle: 'Information and communication technology supply chain security', newTitle: 'Assessment and decision on information security events' },
+  { annex: 5, oldTitle: 'Monitoring, review, and change management of supplier services', newTitle: 'Response to information security incidents' },
+  { annex: 5, oldTitle: 'Incident management responsibilities and procedures', newTitle: 'Learning from information security incidents' },
+  { annex: 5, oldTitle: 'Reporting information security events', newTitle: 'Collection of evidence' },
+  { annex: 5, oldTitle: 'Reporting information security weaknesses', newTitle: 'Information security during disruption' },
+  { annex: 5, oldTitle: 'Assessment and decision on information security events', newTitle: 'ICT readiness for business continuity' },
+  { annex: 5, oldTitle: 'Response to information security incidents', newTitle: 'Legal, statutory, regulatory and contractual requirements' },
+  { annex: 5, oldTitle: 'Learning from information security incidents', newTitle: 'Intellectual property rights' },
+  { annex: 5, oldTitle: 'Collection of evidence', newTitle: 'Protection of records' },
+  { annex: 5, oldTitle: 'Business continuity planning for information security', newTitle: 'Privacy and protection of personal information' },
+  { annex: 5, oldTitle: 'Redundancy of information processing facilities', newTitle: 'Independent review of information security' },
+  { annex: 5, oldTitle: 'Documented operating procedures', newTitle: 'Compliance with policies, rules and standards' },
+
+  // A.6 reorder
+  { annex: 6, oldTitle: 'Confidentiality or non-disclosure agreements', newTitle: 'Responsibilities after termination or change of employment' },
+  { annex: 6, oldTitle: 'Remote working', newTitle: 'Confidentiality or non-disclosure agreements' },
+  { annex: 6, oldTitle: 'Termination or change of employment responsibilities', newTitle: 'Remote working' },
+  { annex: 6, oldTitle: 'User responsibilities', newTitle: 'Information security event reporting' },
+
+  // A.7 reorder
+  { annex: 7, oldTitle: 'Protecting against physical and environmental threats', newTitle: 'Physical security monitoring' },
+  { annex: 7, oldTitle: 'Working in secure areas', newTitle: 'Protecting against physical and environmental threats' },
+  { annex: 7, oldTitle: 'Visitor access records', newTitle: 'Working in secure areas' },
+  { annex: 7, oldTitle: 'Delivery and loading areas', newTitle: 'Clear desk and clear screen' },
+  // A.7.8 Equipment siting and protection — unchanged
+  { annex: 7, oldTitle: 'Supporting utilities', newTitle: 'Security of assets off-premises' },
+  { annex: 7, oldTitle: 'Cabling security', newTitle: 'Storage media' },
+  { annex: 7, oldTitle: 'Equipment maintenance', newTitle: 'Supporting utilities' },
+  { annex: 7, oldTitle: 'Secure disposal or re-use of equipment', newTitle: 'Cabling security' },
+  { annex: 7, oldTitle: 'Removal of assets', newTitle: 'Equipment maintenance' },
+  { annex: 7, oldTitle: 'Clear desk and clear screen policy', newTitle: 'Secure disposal or re-use of equipment' },
+
+  // A.8 rebuild to 2022 titles (A.8.1, A.8.2 unchanged)
+  { annex: 8, oldTitle: 'Access to source code', newTitle: 'Information access restriction' },
+  { annex: 8, oldTitle: 'Change management', newTitle: 'Access to source code' },
+  { annex: 8, oldTitle: 'Capacity management', newTitle: 'Secure authentication' },
+  { annex: 8, oldTitle: 'Development, testing and operational environments', newTitle: 'Capacity management' },
+  { annex: 8, oldTitle: 'Protection of test data', newTitle: 'Protection against malware' },
+  { annex: 8, oldTitle: 'Logging and monitoring', newTitle: 'Management of technical vulnerabilities' },
+  { annex: 8, oldTitle: 'Clock synchronization', newTitle: 'Configuration management' },
+  { annex: 8, oldTitle: 'Protection of log information', newTitle: 'Information deletion' },
+  { annex: 8, oldTitle: 'Administrator and operator logs', newTitle: 'Data masking' },
+  { annex: 8, oldTitle: 'Fault logging', newTitle: 'Data leakage prevention' },
+  { annex: 8, oldTitle: 'Cryptographic controls policy', newTitle: 'Information backup' },
+  { annex: 8, oldTitle: 'Key management', newTitle: 'Redundancy of information processing facilities' },
+  { annex: 8, oldTitle: 'Network controls', newTitle: 'Logging' },
+  { annex: 8, oldTitle: 'Security of network services', newTitle: 'Monitoring activities' },
+  { annex: 8, oldTitle: 'Segregation of networks', newTitle: 'Clock synchronization' },
+  { annex: 8, oldTitle: 'Use of network services', newTitle: 'Use of privileged utility programs' },
+  { annex: 8, oldTitle: 'Web filtering', newTitle: 'Installation of software on operational systems' },
+  { annex: 8, oldTitle: 'Cryptographic key usage', newTitle: 'Networks security' },
+  { annex: 8, oldTitle: 'Backup', newTitle: 'Security of network services' },
+  { annex: 8, oldTitle: 'Information transfer policies and procedures', newTitle: 'Segregation of networks' },
+  { annex: 8, oldTitle: 'Electronic messaging', newTitle: 'Web filtering' },
+  { annex: 8, oldTitle: 'Confidentiality of information in networks', newTitle: 'Use of cryptography' },
+  { annex: 8, oldTitle: 'Security of system files', newTitle: 'Secure development life cycle' },
+  { annex: 8, oldTitle: 'Malware protection', newTitle: 'Application security requirements' },
+  { annex: 8, oldTitle: 'Technical vulnerability management', newTitle: 'Secure system architecture and engineering principles' },
+  { annex: 8, oldTitle: 'Configuration management', newTitle: 'Secure coding' },
+  { annex: 8, oldTitle: 'Monitoring of system use', newTitle: 'Security testing in development and acceptance' },
+  { annex: 8, oldTitle: 'Protection of application services', newTitle: 'Outsourced development' },
+  { annex: 8, oldTitle: 'Data masking', newTitle: 'Separation of development, test and production environments' },
+];
+
+const PHANTOM_A8_TITLES = [
+  'Network service security audit',
+  'Network service security compliance',
+  'Network service security reporting',
+  'Network service security improvement',
+];
+
+// New A.5.37 and correct A.8.32-34 (2022 standard). control_id value for new
+// rows is computed at insert time to match the existing VW convention:
+//   A.{annex.index}.{ctrl.index}  — e.g. "A.5.37", "A.8.32"
+const NEW_ANNEX_CONTROLS = [
+  {
+    annex: 5,
+    control_id: 'A.5.37',
+    order_no: 37,
+    title: 'Documented operating procedures',
+    requirement_summary: 'Document operating procedures for information processing facilities and make them available to personnel who need them.',
+  },
+  {
+    annex: 8,
+    control_id: 'A.8.32',
+    order_no: 32,
+    title: 'Change management',
+    requirement_summary: 'Control changes to information processing facilities through formal procedures including submission, assessment, authorization, implementation, and review.',
+  },
+  {
+    annex: 8,
+    control_id: 'A.8.33',
+    order_no: 33,
+    title: 'Test information',
+    requirement_summary: 'Select, protect, and manage test information. Avoid production data with personal/sensitive content; apply masking or anonymization when production data must be used.',
+  },
+  {
+    annex: 8,
+    control_id: 'A.8.34',
+    order_no: 34,
+    title: 'Protection of information systems during audit testing',
+    requirement_summary: 'Plan and coordinate audit tests to minimize business disruption. Restrict scope and schedule tests outside business hours where possible.',
+  },
+];
+
+const NEW_SUBCLAUSES = [
+  {
+    clauseNo: 6,
+    subclause_id: '6.1.1',
+    order_no: 1,
+    title: 'General — actions to address risks and opportunities',
+    requirement_summary: 'When planning for the ISMS, consider the issues from 4.1 and requirements from 4.2 to determine risks and opportunities that need to be addressed to ensure the ISMS achieves its intended outcomes.',
+  },
+  {
+    clauseNo: 6,
+    subclause_id: '6.3',
+    order_no: 5,
+    title: 'Planning of changes',
+    requirement_summary: 'When the organization determines the need for changes to the ISMS, the changes shall be carried out in a planned manner.',
+  },
+];
+
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'ISO 27001' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[iso27001-2022] framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      // ----- CLAUSE 6: rename two '6.1' rows to '6.1.2' / '6.1.3', add 6.1.1 + 6.3
+      const [[clause6]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.clauses_struct_iso27001
+         WHERE framework_id = :frameworkId AND clause_id = '6' LIMIT 1;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      if (clause6?.id) {
+        await queryInterface.sequelize.query(
+          `UPDATE verifywise.subclauses_struct_iso27001
+             SET subclause_id = '6.1.2', order_no = 2
+           WHERE clause_id = :clauseId AND title = 'Information security risk assessment';`,
+          { transaction: t, replacements: { clauseId: clause6.id } }
+        );
+        await queryInterface.sequelize.query(
+          `UPDATE verifywise.subclauses_struct_iso27001
+             SET subclause_id = '6.1.3', order_no = 3
+           WHERE clause_id = :clauseId AND title = 'Information security risk treatment';`,
+          { transaction: t, replacements: { clauseId: clause6.id } }
+        );
+
+        // Final ordering under clause 6: 6.1.1 (1), 6.1.2 (2), 6.1.3 (3),
+        // 6.2 (4), 6.3 (5). Bump 6.2 from its current order_no to 4.
+        await queryInterface.sequelize.query(
+          `UPDATE verifywise.subclauses_struct_iso27001
+             SET order_no = 4
+           WHERE clause_id = :clauseId AND subclause_id = '6.2';`,
+          { transaction: t, replacements: { clauseId: clause6.id } }
+        );
+
+        for (const sub of NEW_SUBCLAUSES) {
+          const [[existing]] = await queryInterface.sequelize.query(
+            `SELECT id FROM verifywise.subclauses_struct_iso27001
+             WHERE clause_id = :clauseId AND subclause_id = :subclause_id LIMIT 1;`,
+            { transaction: t, replacements: { clauseId: clause6.id, subclause_id: sub.subclause_id } }
+          );
+          let structId = existing?.id;
+          if (!structId) {
+            const [[inserted]] = await queryInterface.sequelize.query(
+              `INSERT INTO verifywise.subclauses_struct_iso27001
+                 (clause_id, subclause_id, title, requirement_summary, order_no, is_demo)
+               VALUES (:clauseId, :subclause_id, :title, :requirement_summary, :order_no, false)
+               RETURNING id;`,
+              {
+                transaction: t,
+                replacements: {
+                  clauseId: clause6.id,
+                  subclause_id: sub.subclause_id,
+                  title: sub.title,
+                  requirement_summary: sub.requirement_summary,
+                  order_no: sub.order_no,
+                },
+              }
+            );
+            structId = inserted.id;
+          }
+
+          await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.subclauses_iso27001
+               (organization_id, projects_frameworks_id, subclause_meta_id, status)
+             SELECT pf.organization_id, pf.id, :structId, 'Not started'
+             FROM verifywise.projects_frameworks pf
+             WHERE pf.framework_id = :frameworkId
+               AND NOT EXISTS (
+                 SELECT 1 FROM verifywise.subclauses_iso27001 si
+                 WHERE si.projects_frameworks_id = pf.id AND si.subclause_meta_id = :structId
+               );`,
+            { transaction: t, replacements: { structId, frameworkId } }
+          );
+        }
+      }
+
+      // ----- ANNEX RENAMES (two-phase with placeholder tokens to avoid
+      //       cascade collisions where a rename's NEW title matches another
+      //       rename's OLD title).
+      // Phase 1: old title → unique placeholder
+      for (let i = 0; i < ANNEX_RENAMES.length; i++) {
+        const r = ANNEX_RENAMES[i];
+        await queryInterface.sequelize.query(
+          `UPDATE verifywise.annexcontrols_struct_iso27001
+             SET title = :placeholder
+           WHERE title = :oldTitle
+             AND category_id IN (
+               SELECT id FROM verifywise.annexcategories_struct_iso27001
+               WHERE framework_id = :frameworkId AND annex_id = :annexId
+             );`,
+          {
+            transaction: t,
+            replacements: {
+              frameworkId,
+              annexId: `A.${r.annex}`,
+              oldTitle: r.oldTitle,
+              placeholder: `__ISO27001_RENAME_${i}__`,
+            },
+          }
+        );
+      }
+      // Phase 2: placeholder → final new title
+      for (let i = 0; i < ANNEX_RENAMES.length; i++) {
+        const r = ANNEX_RENAMES[i];
+        await queryInterface.sequelize.query(
+          `UPDATE verifywise.annexcontrols_struct_iso27001
+             SET title = :newTitle
+           WHERE title = :placeholder
+             AND category_id IN (
+               SELECT id FROM verifywise.annexcategories_struct_iso27001
+               WHERE framework_id = :frameworkId AND annex_id = :annexId
+             );`,
+          {
+            transaction: t,
+            replacements: {
+              frameworkId,
+              annexId: `A.${r.annex}`,
+              newTitle: r.newTitle,
+              placeholder: `__ISO27001_RENAME_${i}__`,
+            },
+          }
+        );
+      }
+
+      // ----- DELETE phantom A.8.32-A.8.35
+      // Use toPgArray to build a literal text[] value, since passing a JS array
+      // directly through :replacements gets expanded as positional parameters.
+      await queryInterface.sequelize.query(
+        `DELETE FROM verifywise.annexcontrols_struct_iso27001
+         WHERE title = ANY(:phantoms::text[])
+           AND category_id IN (
+             SELECT id FROM verifywise.annexcategories_struct_iso27001
+             WHERE framework_id = :frameworkId AND annex_id = 'A.8'
+           );`,
+        { transaction: t, replacements: { frameworkId, phantoms: toPgArray(PHANTOM_A8_TITLES) } }
+      );
+
+      // ----- INSERT new annex controls (A.5.37, A.8.32, A.8.33, A.8.34)
+      for (const ctrl of NEW_ANNEX_CONTROLS) {
+        const [[category]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.annexcategories_struct_iso27001
+           WHERE framework_id = :frameworkId AND annex_id = :annexId LIMIT 1;`,
+          { transaction: t, replacements: { frameworkId, annexId: `A.${ctrl.annex}` } }
+        );
+        const [[annexStruct]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.annex_struct_iso27001
+           WHERE framework_id = :frameworkId AND order_no = :order LIMIT 1;`,
+          { transaction: t, replacements: { frameworkId, order: ctrl.annex } }
+        );
+        if (!category?.id) continue;
+
+        const [[existing]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.annexcontrols_struct_iso27001
+           WHERE category_id = :categoryId AND control_id = :control_id LIMIT 1;`,
+          { transaction: t, replacements: { categoryId: category.id, control_id: ctrl.control_id } }
+        );
+        let structId = existing?.id;
+        if (!structId) {
+          const [[inserted]] = await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.annexcontrols_struct_iso27001
+               (category_id, annex_id, control_id, title, order_no, requirement_summary, is_demo)
+             VALUES (:categoryId, :annexStructId, :control_id, :title, :order_no, :requirement_summary, false)
+             RETURNING id;`,
+            {
+              transaction: t,
+              replacements: {
+                categoryId: category.id,
+                annexStructId: annexStruct?.id ?? null,
+                control_id: ctrl.control_id,
+                title: ctrl.title,
+                order_no: ctrl.order_no,
+                requirement_summary: ctrl.requirement_summary,
+              },
+            }
+          );
+          structId = inserted.id;
+        }
+
+        await queryInterface.sequelize.query(
+          `INSERT INTO verifywise.annexcontrols_iso27001
+             (organization_id, projects_frameworks_id, annexcontrol_meta_id, status)
+           SELECT pf.organization_id, pf.id, :structId, 'Not started'
+           FROM verifywise.projects_frameworks pf
+           WHERE pf.framework_id = :frameworkId
+             AND NOT EXISTS (
+               SELECT 1 FROM verifywise.annexcontrols_iso27001 ac
+               WHERE ac.projects_frameworks_id = pf.id AND ac.annexcontrol_meta_id = :structId
+             );`,
+          { transaction: t, replacements: { structId, frameworkId } }
+        );
+      }
+
+      await t.commit();
+      console.log('[iso27001-2022] clause 6 split, annex renames, phantom removal, and new controls applied');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down() {
+    // Intentionally no-op. The forward migration is a bulk rename/alignment to
+    // the 2022 standard; reverting to the 2013-era mix-up state would introduce
+    // more confusion than it resolves. A targeted rollback can be written
+    // per-change if needed.
+  },
+};
diff --git a/Servers/database/migrations/20260420124000-iso27001-refresh-content-2022.js b/Servers/database/migrations/20260420124000-iso27001-refresh-content-2022.js
new file mode 100644
index 0000000000..63b79b5035
--- /dev/null
+++ b/Servers/database/migrations/20260420124000-iso27001-refresh-content-2022.js
@@ -0,0 +1,85 @@
+'use strict';
+
+/**
+ * Pushes the 2022-aligned requirement_summary / key_questions /
+ * evidence_examples / implementation_description content from the updated
+ * struct file into existing DB rows.
+ *
+ * Runs AFTER 20260420113913-iso27001-align-to-2022-standard.js which handles
+ * title renames, phantom removal, and new-control inserts. Once titles are
+ * aligned to 2022 in the DB, this migration iterates the struct file and
+ * UPDATEs each matching row's content fields by title.
+ *
+ * Content source of truth is the TS struct file itself; the dist build is
+ * loaded at migration time. Idempotent — re-running is a no-op at the data
+ * level if content already matches.
+ */
+const toPgArray = (arr) => {
+  if (!arr || !Array.isArray(arr) || arr.length === 0) return '{}';
+  const escaped = arr.map(v => `"${String(v).replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`);
+  return `{${escaped.join(',')}}`;
+};
+
+module.exports = {
+  async up(queryInterface) {
+    const { ISO27001Annex } = require('../../dist/structures/ISO-27001/annexes/iso27001.annex.struct');
+
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'ISO 27001' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[iso27001-refresh-content] ISO 27001 framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      let updated = 0;
+      for (const annex of ISO27001Annex) {
+        for (const ctrl of annex.controls) {
+          const [result] = await queryInterface.sequelize.query(
+            `UPDATE verifywise.annexcontrols_struct_iso27001
+               SET requirement_summary = :req,
+                   key_questions       = :kq,
+                   evidence_examples   = :ev,
+                   description         = COALESCE(description, '')
+             WHERE title = :title
+               AND category_id IN (
+                 SELECT id FROM verifywise.annexcategories_struct_iso27001
+                 WHERE framework_id = :frameworkId AND annex_id = :annexId
+               );`,
+            {
+              transaction: t,
+              replacements: {
+                title: ctrl.title,
+                req: ctrl.requirement_summary || '',
+                kq: toPgArray(ctrl.key_questions || []),
+                ev: toPgArray(ctrl.evidence_examples || []),
+                frameworkId,
+                annexId: `A.${annex.index}`,
+              },
+            }
+          );
+          if (result && typeof result === 'object' && 'rowCount' in result) {
+            updated += Number(result.rowCount) || 0;
+          }
+        }
+      }
+
+      console.log(`[iso27001-refresh-content] refreshed content fields; approx rows updated: ${updated}`);
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down() {
+    // Intentionally no-op. The original generic boilerplate was not audit-
+    // accurate; reverting to it would be a regression. Individual rollback can
+    // be scripted if genuinely needed.
+  },
+};
diff --git a/Servers/database/migrations/20260420124839-iso42001-clarify-a8-overview.js b/Servers/database/migrations/20260420124839-iso42001-clarify-a8-overview.js
new file mode 100644
index 0000000000..48297f5438
--- /dev/null
+++ b/Servers/database/migrations/20260420124839-iso42001-clarify-a8-overview.js
@@ -0,0 +1,51 @@
+'use strict';
+
+/**
+ * Clarifies VW A.8 sub_id 1.1 "AI system lifecycle management" as an
+ * organizational overview item (not a distinct ISO 42001 Annex A.5 control —
+ * the standard starts at A.5.2).
+ *
+ * Per the brief's wording-review guidance: mark as an organizational note
+ * rather than a control. Title is softened to make its overview nature
+ * explicit; guidance, description, and implementation_description are
+ * rewritten to avoid implying a second stage-by-stage coverage.
+ */
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.sequelize.query(`
+      UPDATE verifywise.annexcategories_struct_iso
+         SET title = 'AI system lifecycle — overall approach',
+             description = 'Organizational overview of how the AI system lifecycle is governed end to end. Not a distinct ISO 42001 Annex A.5 control (the standard starts at A.5.2); retained as an umbrella item to record overall lifecycle posture.',
+             guidance = 'Describe, at a high level, how the organization structures the AI lifecycle end to end (requirements, design, data, build, V&V, deployment, operation, maintenance, retirement). The detailed ISO A.5.2–A.5.10 sub-controls are covered by the items that follow.'
+       WHERE sub_id = 1.1
+         AND title = 'AI system lifecycle management'
+         AND annex_id IN (
+           SELECT id FROM verifywise.annex_struct_iso
+           WHERE annex_no = 8
+             AND framework_id IN (
+               SELECT id FROM verifywise.frameworks
+               WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+             )
+         );
+    `);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      UPDATE verifywise.annexcategories_struct_iso
+         SET title = 'AI system lifecycle management',
+             description = 'Establishing and managing a defined AI lifecycle process.',
+             guidance = 'A defined lifecycle process should be established and managed for AI systems, covering stages from conception through retirement, incorporating AI-specific considerations.'
+       WHERE sub_id = 1.1
+         AND title = 'AI system lifecycle — overall approach'
+         AND annex_id IN (
+           SELECT id FROM verifywise.annex_struct_iso
+           WHERE annex_no = 8
+             AND framework_id IN (
+               SELECT id FROM verifywise.frameworks
+               WHERE name ILIKE 'ISO 42001%' OR name ILIKE 'ISO/IEC 42001%'
+             )
+         );
+    `);
+  },
+};
diff --git a/Servers/database/migrations/20260421234619-reduce-high-risk-role-to-provider-deployer.js b/Servers/database/migrations/20260421234619-reduce-high-risk-role-to-provider-deployer.js
new file mode 100644
index 0000000000..38f74dd11a
--- /dev/null
+++ b/Servers/database/migrations/20260421234619-reduce-high-risk-role-to-provider-deployer.js
@@ -0,0 +1,122 @@
+'use strict';
+
+/**
+ * Reduces the `type_of_high_risk_role` enum on `projects` to two values:
+ * `Provider` and `Deployer`. Existing rows are remapped:
+ *
+ *   Provider, Product manufacturer, Authorized representative,
+ *   Importer, Distributor                  → Provider
+ *   Deployer, not_applicable               → Deployer
+ *
+ * Postgres enums can't have values dropped in place, so we:
+ *   1) cast the column to text,
+ *   2) UPDATE values that need remapping,
+ *   3) drop the old enum type,
+ *   4) create the new 2-value enum,
+ *   5) cast the column back.
+ */
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      // 1) Drop the column's enum binding so we can rewrite values freely.
+      await queryInterface.sequelize.query(
+        `ALTER TABLE verifywise.projects
+           ALTER COLUMN type_of_high_risk_role TYPE TEXT
+           USING type_of_high_risk_role::text;`,
+        { transaction: t }
+      );
+
+      // 2) Remap to-be-removed values onto the surviving two.
+      await queryInterface.sequelize.query(
+        `UPDATE verifywise.projects
+           SET type_of_high_risk_role = CASE type_of_high_risk_role
+             WHEN 'Provider' THEN 'Provider'
+             WHEN 'Product manufacturer' THEN 'Provider'
+             WHEN 'Authorized representative' THEN 'Provider'
+             WHEN 'Importer' THEN 'Provider'
+             WHEN 'Distributor' THEN 'Provider'
+             WHEN 'Deployer' THEN 'Deployer'
+             WHEN 'not_applicable' THEN 'Deployer'
+             ELSE type_of_high_risk_role
+           END
+         WHERE type_of_high_risk_role IS NOT NULL;`,
+        { transaction: t }
+      );
+
+      // 3) Drop the old enum type. Safe now because no column references it.
+      await queryInterface.sequelize.query(
+        `DROP TYPE IF EXISTS verifywise.enum_projects_type_of_high_risk_role;`,
+        { transaction: t }
+      );
+
+      // 4) Recreate the enum with only the two surviving values.
+      await queryInterface.sequelize.query(
+        `CREATE TYPE verifywise.enum_projects_type_of_high_risk_role
+         AS ENUM ('Deployer', 'Provider');`,
+        { transaction: t }
+      );
+
+      // 5) Restore the column type to the new enum.
+      await queryInterface.sequelize.query(
+        `ALTER TABLE verifywise.projects
+           ALTER COLUMN type_of_high_risk_role TYPE
+             verifywise.enum_projects_type_of_high_risk_role
+           USING type_of_high_risk_role::verifywise.enum_projects_type_of_high_risk_role;`,
+        { transaction: t }
+      );
+
+      await t.commit();
+      console.log('[reduce-high-risk-role] enum collapsed to Provider/Deployer; existing rows remapped');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    // Restore the original 7-value enum. Existing rows stay as Provider/Deployer
+    // — the original wider categorisation can't be reconstructed from the
+    // collapsed values, so this is a one-way data migration in practice.
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      await queryInterface.sequelize.query(
+        `ALTER TABLE verifywise.projects
+           ALTER COLUMN type_of_high_risk_role TYPE TEXT
+           USING type_of_high_risk_role::text;`,
+        { transaction: t }
+      );
+
+      await queryInterface.sequelize.query(
+        `DROP TYPE IF EXISTS verifywise.enum_projects_type_of_high_risk_role;`,
+        { transaction: t }
+      );
+
+      await queryInterface.sequelize.query(
+        `CREATE TYPE verifywise.enum_projects_type_of_high_risk_role AS ENUM (
+           'Deployer',
+           'Provider',
+           'Distributor',
+           'Importer',
+           'Product manufacturer',
+           'Authorized representative',
+           'not_applicable'
+         );`,
+        { transaction: t }
+      );
+
+      await queryInterface.sequelize.query(
+        `ALTER TABLE verifywise.projects
+           ALTER COLUMN type_of_high_risk_role TYPE
+             verifywise.enum_projects_type_of_high_risk_role
+           USING type_of_high_risk_role::verifywise.enum_projects_type_of_high_risk_role;`,
+        { transaction: t }
+      );
+
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+};
diff --git a/Servers/database/migrations/20260422114409-populate-eu-act-role-tier-for-new-categories.js b/Servers/database/migrations/20260422114409-populate-eu-act-role-tier-for-new-categories.js
new file mode 100644
index 0000000000..7c5c26475a
--- /dev/null
+++ b/Servers/database/migrations/20260422114409-populate-eu-act-role-tier-for-new-categories.js
@@ -0,0 +1,186 @@
+'use strict';
+
+/**
+ * Populates the EU AI Act role/tier junction tables for the 8 categories that
+ * the developer brief + fix notes explicitly specify. Also corrects two
+ * categories' `article` metadata that the fix notes identified as wrong:
+ *
+ *   - category order_no 13 (GPAI): article range extended to Art 51-56
+ *     (Art 56 covers codes of practice — a core GPAI compliance path).
+ *   - category order_no 16 (Provider technical requirements): widened to
+ *     Art 9-15, 18-19 (was skipping Art 13 transparency/instructions for use
+ *     and Art 14 human oversight design obligations).
+ *
+ * Mapping source: `eu-ai-act-developer-brief.md` + `eu-ai-act-controls-fix-notes.md`
+ *
+ * | order_no | Category                                           | Roles               | Tier         |
+ * |---------:|----------------------------------------------------|---------------------|--------------|
+ * |        0 | Prohibited AI practices                            | Provider, Deployer  | Prohibited   |
+ * |        8 | Transparency obligations (Art 50)                  | Provider, Deployer  | Limited risk |
+ * |       13 | General-purpose AI models                          | Provider            | GPAI         |
+ * |       14 | High-risk AI system classification                 | Provider            | High risk    |
+ * |       15 | Quality management system                          | Provider            | High risk    |
+ * |       16 | Provider technical requirements                    | Provider            | High risk    |
+ * |       17 | Conformity assessment and market access            | Provider            | High risk    |
+ * |       18 | Deployer data protection and explanation           | Deployer            | High risk    |
+ *
+ * The 11 existing categories (order_no 1-7, 9-12) are deliberately NOT
+ * populated here — their authoritative source (Table A in
+ * `docs/research/eu-ai-act-role-tier-analysis.md`) is not present in the repo.
+ * A filter with empty role/tier mapping should treat those categories as
+ * "applies to all" until the mapping is provided.
+ *
+ * Idempotent: ON CONFLICT DO NOTHING on the junction inserts.
+ */
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'EU AI Act' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[populate-eu-act-role-tier] framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      // 1) Article corrections per fix notes.
+      await queryInterface.sequelize.query(
+        `UPDATE verifywise.controlcategories_struct_eu
+           SET article = 'Art. 51-56'
+         WHERE framework_id = :frameworkId AND order_no = 13;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      await queryInterface.sequelize.query(
+        `UPDATE verifywise.controlcategories_struct_eu
+           SET article = 'Art. 9-15, 18-19'
+         WHERE framework_id = :frameworkId AND order_no = 16;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+
+      // 2) Resolve role + tier lookup ids once.
+      const [roles] = await queryInterface.sequelize.query(
+        `SELECT id, name FROM verifywise.eu_act_roles;`,
+        { transaction: t }
+      );
+      const [tiers] = await queryInterface.sequelize.query(
+        `SELECT id, name FROM verifywise.eu_act_risk_tiers;`,
+        { transaction: t }
+      );
+      const roleId = Object.fromEntries(roles.map((r) => [r.name, r.id]));
+      const tierId = Object.fromEntries(tiers.map((r) => [r.name, r.id]));
+
+      const mappings = [
+        { order_no: 0,  roles: ['Provider', 'Deployer'], tier: 'Prohibited' },
+        { order_no: 8,  roles: ['Provider', 'Deployer'], tier: 'Limited risk' },
+        { order_no: 13, roles: ['Provider'],             tier: 'GPAI' },
+        { order_no: 14, roles: ['Provider'],             tier: 'High risk' },
+        { order_no: 15, roles: ['Provider'],             tier: 'High risk' },
+        { order_no: 16, roles: ['Provider'],             tier: 'High risk' },
+        { order_no: 17, roles: ['Provider'],             tier: 'High risk' },
+        { order_no: 18, roles: ['Deployer'],             tier: 'High risk' },
+      ];
+
+      for (const m of mappings) {
+        const [[cat]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.controlcategories_struct_eu
+           WHERE framework_id = :frameworkId AND order_no = :order_no
+           LIMIT 1;`,
+          { transaction: t, replacements: { frameworkId, order_no: m.order_no } }
+        );
+        if (!cat) {
+          console.warn(`[populate-eu-act-role-tier] category order_no=${m.order_no} not found — skipping`);
+          continue;
+        }
+
+        for (const roleName of m.roles) {
+          const rid = roleId[roleName];
+          if (!rid) {
+            console.warn(`[populate-eu-act-role-tier] role '${roleName}' not in eu_act_roles — skipping`);
+            continue;
+          }
+          await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.controlcategories_struct_eu__roles
+               (control_category_id, role_id)
+             VALUES (:catId, :rid)
+             ON CONFLICT DO NOTHING;`,
+            { transaction: t, replacements: { catId: cat.id, rid } }
+          );
+        }
+
+        const tid = tierId[m.tier];
+        if (!tid) {
+          console.warn(`[populate-eu-act-role-tier] tier '${m.tier}' not in eu_act_risk_tiers — skipping`);
+          continue;
+        }
+        await queryInterface.sequelize.query(
+          `INSERT INTO verifywise.controlcategories_struct_eu__risk_tiers
+             (control_category_id, risk_tier_id)
+           VALUES (:catId, :tid)
+           ON CONFLICT DO NOTHING;`,
+          { transaction: t, replacements: { catId: cat.id, tid } }
+        );
+      }
+
+      await t.commit();
+      console.log('[populate-eu-act-role-tier] populated 8 categories; articles corrected for order_no 13 and 16');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'EU AI Act' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      const orderNos = [0, 8, 13, 14, 15, 16, 17, 18];
+      for (const order_no of orderNos) {
+        const [[cat]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.controlcategories_struct_eu
+           WHERE framework_id = :frameworkId AND order_no = :order_no
+           LIMIT 1;`,
+          { transaction: t, replacements: { frameworkId, order_no } }
+        );
+        if (!cat) continue;
+        await queryInterface.sequelize.query(
+          `DELETE FROM verifywise.controlcategories_struct_eu__roles WHERE control_category_id = :catId;`,
+          { transaction: t, replacements: { catId: cat.id } }
+        );
+        await queryInterface.sequelize.query(
+          `DELETE FROM verifywise.controlcategories_struct_eu__risk_tiers WHERE control_category_id = :catId;`,
+          { transaction: t, replacements: { catId: cat.id } }
+        );
+      }
+
+      // Revert article strings.
+      await queryInterface.sequelize.query(
+        `UPDATE verifywise.controlcategories_struct_eu
+           SET article = 'Art. 51-55' WHERE framework_id = :frameworkId AND order_no = 13;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+      await queryInterface.sequelize.query(
+        `UPDATE verifywise.controlcategories_struct_eu
+           SET article = 'Art. 9-12, 15, 18-19' WHERE framework_id = :frameworkId AND order_no = 16;`,
+        { transaction: t, replacements: { frameworkId } }
+      );
+
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+};
diff --git a/Servers/database/migrations/20260422120348-populate-eu-act-role-tier-for-existing-categories.js b/Servers/database/migrations/20260422120348-populate-eu-act-role-tier-for-existing-categories.js
new file mode 100644
index 0000000000..6c75ed9996
--- /dev/null
+++ b/Servers/database/migrations/20260422120348-populate-eu-act-role-tier-for-existing-categories.js
@@ -0,0 +1,143 @@
+'use strict';
+
+/**
+ * Populates role/tier junction rows for the 11 EU AI Act categories that
+ * existed before the developer brief's new files (order_no 1-7 and 9-12).
+ * Based on the user's article-level behavior map:
+ *
+ *   • AI literacy (Art 4)                    — horizontal, applies broadly
+ *   • Transparency to deployers (Art 13)     — always required for providers
+ *   • Human oversight (Art 14)               — always required for providers
+ *   • Corrective actions (Art 20)            — always required for providers
+ *   • Value chain responsibilities (Art 25)  — always required for providers
+ *   • Deployer obligations (Art 26)          — role/context: deployer
+ *   • FRIA (Art 27)                          — role/context: deployer
+ *   • Registration (Art 49)                  — always required for providers
+ *   • EU database (Art 71)                   — always required for providers
+ *   • Post-market monitoring (Art 72)        — required after deployment
+ *   • Serious incident reporting (Art 73)    — required after deployment
+ *
+ * Together with the prior migration (populate-eu-act-role-tier-for-new-
+ * categories), all 19 EU AI Act categories now carry role + tier metadata.
+ *
+ * Idempotent via ON CONFLICT DO NOTHING on the junction inserts.
+ */
+module.exports = {
+  async up(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'EU AI Act' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        console.warn('[populate-eu-act-role-tier-existing] framework not found — skipping');
+        await t.commit();
+        return;
+      }
+      const frameworkId = framework.id;
+
+      const [roles] = await queryInterface.sequelize.query(
+        `SELECT id, name FROM verifywise.eu_act_roles;`,
+        { transaction: t }
+      );
+      const [tiers] = await queryInterface.sequelize.query(
+        `SELECT id, name FROM verifywise.eu_act_risk_tiers;`,
+        { transaction: t }
+      );
+      const roleId = Object.fromEntries(roles.map((r) => [r.name, r.id]));
+      const tierId = Object.fromEntries(tiers.map((r) => [r.name, r.id]));
+
+      const mappings = [
+        { order_no:  1, roles: ['Provider', 'Deployer'], tier: 'General Risk' },
+        { order_no:  2, roles: ['Provider'],             tier: 'High risk' },
+        { order_no:  3, roles: ['Provider'],             tier: 'High risk' },
+        { order_no:  4, roles: ['Provider'],             tier: 'High risk' },
+        { order_no:  5, roles: ['Provider'],             tier: 'High risk' },
+        { order_no:  6, roles: ['Deployer'],             tier: 'High risk' },
+        { order_no:  7, roles: ['Deployer'],             tier: 'High risk' },
+        { order_no:  9, roles: ['Provider'],             tier: 'High risk' },
+        { order_no: 10, roles: ['Provider'],             tier: 'High risk' },
+        { order_no: 11, roles: ['Provider'],             tier: 'High risk' },
+        { order_no: 12, roles: ['Provider'],             tier: 'High risk' },
+      ];
+
+      for (const m of mappings) {
+        const [[cat]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.controlcategories_struct_eu
+           WHERE framework_id = :frameworkId AND order_no = :order_no
+           LIMIT 1;`,
+          { transaction: t, replacements: { frameworkId, order_no: m.order_no } }
+        );
+        if (!cat) {
+          console.warn(`[populate-eu-act-role-tier-existing] category order_no=${m.order_no} not found — skipping`);
+          continue;
+        }
+
+        for (const roleName of m.roles) {
+          const rid = roleId[roleName];
+          if (!rid) continue;
+          await queryInterface.sequelize.query(
+            `INSERT INTO verifywise.controlcategories_struct_eu__roles
+               (control_category_id, role_id)
+             VALUES (:catId, :rid)
+             ON CONFLICT DO NOTHING;`,
+            { transaction: t, replacements: { catId: cat.id, rid } }
+          );
+        }
+
+        const tid = tierId[m.tier];
+        if (!tid) continue;
+        await queryInterface.sequelize.query(
+          `INSERT INTO verifywise.controlcategories_struct_eu__risk_tiers
+             (control_category_id, risk_tier_id)
+           VALUES (:catId, :tid)
+           ON CONFLICT DO NOTHING;`,
+          { transaction: t, replacements: { catId: cat.id, tid } }
+        );
+      }
+
+      await t.commit();
+      console.log('[populate-eu-act-role-tier-existing] populated 11 legacy categories');
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+
+  async down(queryInterface) {
+    const t = await queryInterface.sequelize.transaction();
+    try {
+      const [[framework]] = await queryInterface.sequelize.query(
+        `SELECT id FROM verifywise.frameworks WHERE name = 'EU AI Act' LIMIT 1;`,
+        { transaction: t }
+      );
+      if (!framework) {
+        await t.commit();
+        return;
+      }
+      const orderNos = [1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12];
+      for (const order_no of orderNos) {
+        const [[cat]] = await queryInterface.sequelize.query(
+          `SELECT id FROM verifywise.controlcategories_struct_eu
+           WHERE framework_id = :frameworkId AND order_no = :order_no
+           LIMIT 1;`,
+          { transaction: t, replacements: { frameworkId: framework.id, order_no } }
+        );
+        if (!cat) continue;
+        await queryInterface.sequelize.query(
+          `DELETE FROM verifywise.controlcategories_struct_eu__roles WHERE control_category_id = :catId;`,
+          { transaction: t, replacements: { catId: cat.id } }
+        );
+        await queryInterface.sequelize.query(
+          `DELETE FROM verifywise.controlcategories_struct_eu__risk_tiers WHERE control_category_id = :catId;`,
+          { transaction: t, replacements: { catId: cat.id } }
+        );
+      }
+      await t.commit();
+    } catch (err) {
+      await t.rollback();
+      throw err;
+    }
+  },
+};
diff --git a/Servers/domain.layer/enums/ai-risk-classification.enum.ts b/Servers/domain.layer/enums/ai-risk-classification.enum.ts
index 1d2420409c..1e4e34f76f 100644
--- a/Servers/domain.layer/enums/ai-risk-classification.enum.ts
+++ b/Servers/domain.layer/enums/ai-risk-classification.enum.ts
@@ -3,4 +3,6 @@ export enum AiRiskClassification {
   HIGH_RISK = "High risk",
   LIMITED_RISK = "Limited risk",
   MINIMAL_RISK = "Minimal risk",
+  GPAI = "GPAI",
+  GENERAL_RISK = "General Risk",
 }
diff --git a/Servers/domain.layer/enums/high-risk-role.enum.ts b/Servers/domain.layer/enums/high-risk-role.enum.ts
index 870b8050fd..e120e51a89 100644
--- a/Servers/domain.layer/enums/high-risk-role.enum.ts
+++ b/Servers/domain.layer/enums/high-risk-role.enum.ts
@@ -1,8 +1,4 @@
 export enum HighRiskRole {
   DEPLOYER = "Deployer",
   PROVIDER = "Provider",
-  DISTRIBUTOR = "Distributor",
-  IMPORTER = "Importer",
-  PRODUCT_MANUFACTURER = "Product manufacturer",
-  AUTHORIZED_REPRESENTATIVE = "Authorized representative",
 }
diff --git a/Servers/domain.layer/frameworks/EU-AI-Act/controlCategoryStructEU.model.ts b/Servers/domain.layer/frameworks/EU-AI-Act/controlCategoryStructEU.model.ts
index 158ef42dad..66812d0387 100644
--- a/Servers/domain.layer/frameworks/EU-AI-Act/controlCategoryStructEU.model.ts
+++ b/Servers/domain.layer/frameworks/EU-AI-Act/controlCategoryStructEU.model.ts
@@ -7,6 +7,7 @@ import {
 } from "sequelize-typescript";
 import { ControlEU } from "./controlEU.model";
 import { FrameworkModel } from "../../models/frameworks/frameworks.model";
+import { Role, RiskTier } from "./euActTypes";
 
 /*
 
@@ -20,6 +21,9 @@ export type ControlCategoryStructEU = {
   order_no?: number; // gets assigned from the structure
   controls?: ControlEU[];
   framework_id?: number; // gets assigned from the structure
+  article?: string;
+  roles?: Role[];
+  riskTiers?: RiskTier[];
 };
 
 @Table({
@@ -55,4 +59,13 @@ export class ControlCategoryStructEUModel extends Model<ControlCategoryStructEU>
     type: DataType.INTEGER,
   })
   framework_id?: number;
+
+  @Column({ type: DataType.TEXT })
+  article?: string;
+
+  // roles and riskTiers are attached via junction tables
+  // (controlcategories_struct_eu__roles and controlcategories_struct_eu__risk_tiers).
+  // The fields are kept on the TypeScript type for struct-file authoring so the
+  // seed / junction-population migration can read them, but they are not stored
+  // directly as columns on this table.
 }
diff --git a/Servers/domain.layer/frameworks/EU-AI-Act/controlStructEU.model.ts b/Servers/domain.layer/frameworks/EU-AI-Act/controlStructEU.model.ts
index 5a0a7e2f96..4bd113da09 100644
--- a/Servers/domain.layer/frameworks/EU-AI-Act/controlStructEU.model.ts
+++ b/Servers/domain.layer/frameworks/EU-AI-Act/controlStructEU.model.ts
@@ -6,6 +6,7 @@ import {
   Table,
 } from "sequelize-typescript";
 import { ControlCategoryStructEUModel } from "./controlCategoryStructEU.model";
+import { Role, RiskTier } from "./euActTypes";
 
 /*
 
@@ -20,6 +21,9 @@ export type ControlStructEU = {
   order_no?: number; // gets assigned from the structure
   implementation_details?: string; // won't get any values, will be filled by user
   control_category_id: number; // when control category is created, its id will be stored and assign here as FK
+  article?: string;
+  roles?: Role[];
+  riskTiers?: RiskTier[];
 };
 
 @Table({
@@ -65,4 +69,10 @@ export class ControlStructEUModel extends Model<ControlStructEU> {
     defaultValue: false,
   })
   is_demo?: boolean;
+
+  @Column({ type: DataType.TEXT })
+  article?: string;
+
+  // roles and riskTiers inherit from the parent controlcategories_struct_eu
+  // via its junction tables; not stored on this table.
 }
diff --git a/Servers/domain.layer/frameworks/EU-AI-Act/euActTypes.ts b/Servers/domain.layer/frameworks/EU-AI-Act/euActTypes.ts
new file mode 100644
index 0000000000..0b7f4579da
--- /dev/null
+++ b/Servers/domain.layer/frameworks/EU-AI-Act/euActTypes.ts
@@ -0,0 +1,20 @@
+export type Role = "Provider" | "Deployer";
+
+export type RiskTier =
+  | "Prohibited"
+  | "High risk"
+  | "Limited risk"
+  | "Minimal risk"
+  | "GPAI"
+  | "General Risk";
+
+export const ROLES: readonly Role[] = ["Provider", "Deployer"] as const;
+
+export const RISK_TIERS: readonly RiskTier[] = [
+  "Prohibited",
+  "High risk",
+  "Limited risk",
+  "Minimal risk",
+  "GPAI",
+  "General Risk",
+] as const;
diff --git a/Servers/domain.layer/frameworks/EU-AI-Act/subControlStructEU.model.ts b/Servers/domain.layer/frameworks/EU-AI-Act/subControlStructEU.model.ts
index 66b0bfa4a0..5591be6192 100644
--- a/Servers/domain.layer/frameworks/EU-AI-Act/subControlStructEU.model.ts
+++ b/Servers/domain.layer/frameworks/EU-AI-Act/subControlStructEU.model.ts
@@ -6,6 +6,7 @@ import {
   Table,
 } from "sequelize-typescript";
 import { ControlEUModel } from "./controlEU.model";
+import { Role, RiskTier } from "./euActTypes";
 
 /*
 
@@ -19,6 +20,9 @@ export type SubcontrolStructEU = {
   description: string; // gets assigned from the structure
   order_no?: number; // gets assigned from the structure
   control_id: number; // when control is created, its id will be stored and assign here as FK
+  article?: string;
+  roles?: Role[];
+  riskTiers?: RiskTier[];
 };
 
 @Table({
@@ -59,4 +63,10 @@ export class SubcontrolStructEUModel extends Model<SubcontrolStructEU> {
     defaultValue: false,
   })
   is_demo?: boolean;
+
+  @Column({ type: DataType.TEXT })
+  article?: string;
+
+  // roles and riskTiers inherit from the category's junction tables; not
+  // stored on this table.
 }
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controlCategories.struct.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controlCategories.struct.ts
index 79c62686eb..7d1fe6d422 100644
--- a/Servers/structures/EU-AI-Act/compliance-tracker/controlCategories.struct.ts
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controlCategories.struct.ts
@@ -1,3 +1,5 @@
+import type { Role, RiskTier } from "../../../domain.layer/frameworks/EU-AI-Act/euActTypes";
+import { ProhibitedPractices } from "./controls/00-prohibited-practices.controls";
 import { AIliteracy } from "./controls/01-ai-literacy.controls";
 import { TransparencyProvision } from "./controls/02-transparency-provision.controls";
 import { HumanOversight } from "./controls/03-human-oversight.controls";
@@ -11,65 +13,169 @@ import { EUdatabaseForHighRiskAI } from "./controls/10-eu-database-for-high-risk
 import { PostMarketMonitoringByProviders } from "./controls/11-post-market-monitor-by-providers.control";
 import { ReportingSeriousIncidents } from "./controls/12-report-serious-incidents.control";
 import { GeneralPurposeAImodels } from "./controls/13-general-purpose-ai.control";
+import { RiskClassification } from "./controls/14-risk-classification.controls";
+import { QualityManagementSystem } from "./controls/15-quality-management-system.controls";
+import { ProviderDocumentation } from "./controls/16-provider-documentation.controls";
+import { ConformityAndMarketAccess } from "./controls/17-conformity-and-market-access.controls";
+import { DeployerDataRights } from "./controls/18-deployer-data-rights.controls";
 
-export const ControlCategories = [
-  { order_no: 1, title: "AI literacy", controls: AIliteracy },
+/**
+ * Registration of EU AI Act control categories.
+ *
+ * Each entry carries `article` (safe — derived from the category's obligation Article)
+ * but leaves `roles` and `riskTiers` UNPOPULATED for now. Those per-category
+ * assignments need review against the actual Article text before they go live
+ * (see plan: "Per-category roles / riskTiers assignments are unverified").
+ * Once a verified Article × role × tier table is approved, populate those fields
+ * in this file and run the reseed migration.
+ */
+type RegistrationSubControl = {
+  order_no: number;
+  title: string;
+  description: string;
+  implementation_details?: string;
+  evidence_description?: string;
+  feedback_description?: string;
+  article?: string;
+  roles?: Role[];
+  riskTiers?: RiskTier[];
+};
+
+type RegistrationControl = {
+  order_no: number;
+  title: string;
+  description: string;
+  implementation_details?: string;
+  article?: string;
+  roles?: Role[];
+  riskTiers?: RiskTier[];
+  subControls: RegistrationSubControl[];
+};
+
+type ControlCategoryRegistration = {
+  order_no: number;
+  title: string;
+  article?: string;
+  roles?: Role[];
+  riskTiers?: RiskTier[];
+  controls: RegistrationControl[];
+};
+
+export const ControlCategories: ControlCategoryRegistration[] = [
+  {
+    order_no: 0,
+    title: "Prohibited AI practices",
+    article: "Art. 5",
+    controls: ProhibitedPractices,
+  },
+  {
+    order_no: 1,
+    title: "AI literacy",
+    article: "Art. 4",
+    controls: AIliteracy,
+  },
   {
     order_no: 2,
     title: "Transparency and provision of information to deployers",
+    article: "Art. 13",
     controls: TransparencyProvision,
   },
   {
     order_no: 3,
     title: "Human oversight",
+    article: "Art. 14",
     controls: HumanOversight,
   },
   {
     order_no: 4,
     title: "Corrective actions and duty of information",
+    article: "Art. 20",
     controls: CorrectiveActionsDutyOfInfo,
   },
   {
     order_no: 5,
     title: "Responsibilities along the AI value chain",
+    article: "Art. 25",
     controls: ResponsibilitiesAlongAI,
   },
   {
     order_no: 6,
     title: "Obligations of deployers of high-risk AI systems",
+    article: "Art. 26",
     controls: ObligationsOfDeployersAIsystems,
   },
   {
     order_no: 7,
     title: "Fundamental rights impact assessments for high-risk AI systems",
+    article: "Art. 27",
     controls: FundamentalRightsImpactAssessments,
   },
   {
     order_no: 8,
     title:
       "Transparency obligations for providers and users of certain AI systems",
+    article: "Art. 50",
     controls: TransparencyObligationsForProviders,
   },
-  { order_no: 9, title: "Registration", controls: Registration },
+  {
+    order_no: 9,
+    title: "Registration",
+    article: "Art. 49",
+    controls: Registration,
+  },
   {
     order_no: 10,
     title: "EU database for high-risk AI systems listed in Annex III",
+    article: "Art. 71",
     controls: EUdatabaseForHighRiskAI,
   },
   {
     order_no: 11,
     title:
       "Post-market monitoring by providers and post-market monitoring plan for high-risk AI systems",
+    article: "Art. 72",
     controls: PostMarketMonitoringByProviders,
   },
   {
     order_no: 12,
     title: "Reporting of serious incidents",
+    article: "Art. 73",
     controls: ReportingSeriousIncidents,
   },
   {
     order_no: 13,
     title: "General-purpose AI models",
+    article: "Art. 51-55",
     controls: GeneralPurposeAImodels,
   },
+  {
+    order_no: 14,
+    title: "High-risk AI system classification",
+    article: "Art. 6-7",
+    controls: RiskClassification,
+  },
+  {
+    order_no: 15,
+    title: "Quality management system",
+    article: "Art. 17",
+    controls: QualityManagementSystem,
+  },
+  {
+    order_no: 16,
+    title: "Provider technical requirements",
+    article: "Art. 9-12, 15, 18-19",
+    controls: ProviderDocumentation,
+  },
+  {
+    order_no: 17,
+    title: "Conformity assessment and market access",
+    article: "Art. 22, 43-48",
+    controls: ConformityAndMarketAccess,
+  },
+  {
+    order_no: 18,
+    title: "Deployer data protection and explanation obligations",
+    article: "Art. 26(5)-(6), Art. 85",
+    controls: DeployerDataRights,
+  },
 ];
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/00-prohibited-practices.controls.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/00-prohibited-practices.controls.ts
new file mode 100644
index 0000000000..df0dbcb65c
--- /dev/null
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/00-prohibited-practices.controls.ts
@@ -0,0 +1,194 @@
+export const ProhibitedPractices = [
+  {
+    order_no: 1,
+    title:
+      "The organization does not deploy AI systems that use subliminal techniques beyond a person's consciousness to materially distort behavior, causing or likely to cause physical or psychological harm.",
+    description:
+      "Prohibits deployment of AI using subliminal or manipulative techniques below conscious awareness that materially distort behavior and are likely to cause harm (Art 5.1.a).",
+    article: "Art. 5(1)(a)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have reviewed all AI systems for subliminal or manipulative techniques that operate below conscious awareness.",
+        description:
+          "Documented review of all deployed and planned AI systems against subliminal manipulation criteria.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We have documented the assessment confirming no AI system uses techniques intended to materially distort a person's behavior in a manner likely to cause harm.",
+        description:
+          "Written attestation of non-applicability or, where applicable, documented removal or redesign of such techniques.",
+      },
+    ],
+  },
+  {
+    order_no: 2,
+    title:
+      "The organization does not deploy AI systems that exploit vulnerabilities of specific groups due to age, disability, or social or economic situation to materially distort behavior, causing or likely to cause harm.",
+    description:
+      "Prohibits AI that exploits vulnerabilities of specific groups (age, disability, socio-economic situation) in a way that materially distorts behavior and is likely to cause harm (Art 5.1.b).",
+    article: "Art. 5(1)(b)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have assessed whether any AI system specifically targets or disproportionately affects vulnerable groups (children, elderly, persons with disabilities, economically disadvantaged persons).",
+        description:
+          "Vulnerability impact assessment records for each AI system in scope.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We have documented safeguards preventing AI systems from exploiting group-specific vulnerabilities.",
+        description:
+          "Design controls, usage restrictions, and monitoring processes documented for vulnerability mitigation.",
+      },
+    ],
+  },
+  {
+    order_no: 3,
+    title:
+      "The organization does not use AI systems for social scoring — evaluating or classifying natural persons based on social behavior or personal characteristics, leading to detrimental or unfavorable treatment unrelated to the context of data collection.",
+    description:
+      "Prohibits use of AI for social scoring that produces detrimental treatment unrelated to the context of data collection (Art 5.1.c).",
+    article: "Art. 5(1)(c)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have confirmed no AI system assigns scores or classifications to individuals based on social behavior or inferred personal traits for purposes unrelated to the original data collection context.",
+        description:
+          "Inventory of scoring/classification systems with context-of-use mapping.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We have reviewed all scoring, ranking, or classification systems to ensure none constitute general-purpose social scoring.",
+        description:
+          "Scoring-system review reports documenting purpose, data sources, and decision impacts.",
+      },
+    ],
+  },
+  {
+    order_no: 4,
+    title:
+      "The organization does not use real-time remote biometric identification systems in publicly accessible spaces for law enforcement purposes, except under the narrow exceptions permitted by the regulation.",
+    description:
+      "Prohibits use of real-time remote biometric identification in publicly accessible spaces for law enforcement purposes, outside the narrow Art 5.1.d exceptions.",
+    article: "Art. 5(1)(d)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have confirmed no real-time remote biometric identification system is deployed in publicly accessible spaces.",
+        description:
+          "System inventory and deployment-context assessment records.",
+      },
+      {
+        order_no: 2,
+        title:
+          "If any exception applies (targeted search for victims, prevention of imminent threat, locating suspects of serious crime), we have documented the specific legal basis, prior judicial authorization, and necessity assessment.",
+        description:
+          "Legal basis memorandum, judicial authorization records, and necessity/proportionality assessment per use.",
+      },
+    ],
+  },
+  {
+    order_no: 5,
+    title:
+      "The organization does not use AI systems for emotion recognition in workplace or educational settings, except for medical or safety purposes.",
+    description:
+      "Prohibits emotion recognition systems in workplace and educational settings except for medical or safety purposes (Art 5.1.e).",
+    article: "Art. 5(1)(e)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have confirmed no AI system infers emotions of employees, job candidates, or students based on biometric data.",
+        description:
+          "HR/EdTech system inventory and emotion-inference capability assessment.",
+      },
+      {
+        order_no: 2,
+        title:
+          "If emotion recognition is used for medical or safety reasons, we have documented the specific justification and obtained any required consent.",
+        description:
+          "Medical/safety justification records and consent management artifacts.",
+      },
+    ],
+  },
+  {
+    order_no: 6,
+    title:
+      "The organization does not use AI systems for biometric categorization that individually categorize natural persons to deduce or infer race, political opinions, trade union membership, religious or philosophical beliefs, sex life, or sexual orientation.",
+    description:
+      "Prohibits biometric categorization AI systems that infer sensitive personal attributes (Art 5.1.f).",
+    article: "Art. 5(1)(f)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have confirmed no AI system uses biometric data (facial images, fingerprints, voice, gait) to infer sensitive personal attributes.",
+        description:
+          "Biometric system inventory, data-flow analysis, and inference-target review.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We have reviewed all biometric processing systems and documented that none classify individuals by protected characteristics.",
+        description:
+          "Classification target review report and documented controls.",
+      },
+    ],
+  },
+  {
+    order_no: 7,
+    title:
+      "The organization does not create or expand facial recognition databases through untargeted scraping of facial images from the internet or CCTV footage.",
+    description:
+      "Prohibits creating/expanding facial recognition databases through untargeted scraping of internet or CCTV images (Art 5.1.g).",
+    article: "Art. 5(1)(g)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have confirmed no AI system collects facial images from public internet sources or surveillance cameras for building facial recognition databases.",
+        description:
+          "Data-sourcing review for facial recognition datasets.",
+      },
+      {
+        order_no: 2,
+        title:
+          "Any facial recognition system in use relies only on lawfully obtained, purpose-specific image datasets.",
+        description:
+          "Data provenance records and data processing agreements for facial recognition datasets.",
+      },
+    ],
+  },
+  {
+    order_no: 8,
+    title:
+      "The organization does not use AI systems to make individual risk assessments of natural persons for predicting criminal offenses based solely on profiling or personality traits.",
+    description:
+      "Prohibits AI that predicts criminal offenses of natural persons based solely on profiling or personality traits (Art 5.1.h).",
+    article: "Art. 5(1)(h)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have confirmed no AI system predicts the likelihood of a natural person committing a criminal offense based solely on profiling, prior offending, or personality assessment.",
+        description:
+          "Predictive policing / risk-scoring system inventory and logic review.",
+      },
+      {
+        order_no: 2,
+        title:
+          "Any crime-related AI system supplements, rather than replaces, human assessment and is based on objective, verifiable facts directly linked to criminal activity.",
+        description:
+          "Human-in-the-loop design documentation and evidence basis for crime-related AI outputs.",
+      },
+    ],
+  },
+];
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/08-transparency-obligations-for-providers.control.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/08-transparency-obligations-for-providers.control.ts
index 97fa6581ef..47bf7086f3 100644
--- a/Servers/structures/EU-AI-Act/compliance-tracker/controls/08-transparency-obligations-for-providers.control.ts
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/08-transparency-obligations-for-providers.control.ts
@@ -5,6 +5,7 @@ export const TransparencyObligationsForProviders = [
     description:
       "Ensure clear communication that users are interacting with AI systems and provide comprehensive information about AI system functionalities and impacts.",
     implementation_details: "Implementation in progress with focus on user interface modifications",
+    article: "Art. 50(1)",
     subControls: [
       {
         order_no: 1,
@@ -24,6 +25,7 @@ export const TransparencyObligationsForProviders = [
     description:
       "Ensure AI indications are clear and understandable for reasonably informed users.",
     implementation_details: "Planning phase - designing user communication strategy",
+    article: "Art. 50(1)",
     subControls: [
       {
         order_no: 1,
@@ -52,6 +54,7 @@ export const TransparencyObligationsForProviders = [
     description:
       "Define and document AI system scope, goals, methods, and potential impacts.",
     implementation_details: "Comprehensive documentation helps align AI deployment with intended goals and prepares for potential risks.",
+    article: "Art. 50(1)",
     subControls: [
       {
         order_no: 1,
@@ -71,6 +74,7 @@ export const TransparencyObligationsForProviders = [
     description:
       "Maintain accurate records of AI system activities, including modifications and third-party involvements.",
     implementation_details: "Accurate records ensure accountability and support audits, troubleshooting, and regulatory compliance.",
+    article: "Art. 50(1)",
     subControls: [
       {
         order_no: 1,
@@ -84,4 +88,76 @@ export const TransparencyObligationsForProviders = [
       },
     ],
   },
+  {
+    order_no: 5,
+    title:
+      "Inform natural persons exposed to an emotion recognition system or a biometric categorization system about its operation.",
+    description:
+      "Emotion recognition and biometric categorization disclosure obligation (Art 50.2).",
+    article: "Art. 50(2)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We inform individuals that they are being exposed to an emotion recognition system, and provide information about the categories of data processed (biometric data type, purpose, storage duration).",
+        description:
+          "Disclosure notices covering system purpose, biometric data category, and storage duration.",
+      },
+      {
+        order_no: 2,
+        title:
+          "Where applicable, we comply with GDPR requirements for processing biometric and special category data.",
+        description:
+          "GDPR Art 9 legal basis, safeguards, and records maintained for biometric/special-category processing.",
+      },
+    ],
+  },
+  {
+    order_no: 6,
+    title:
+      "Label AI-generated or manipulated image, audio, or video content that constitutes a deep fake.",
+    description:
+      "Deep fake labeling obligation with machine-readable marking where feasible (Art 50.3).",
+    article: "Art. 50(3)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "All AI-generated or substantially manipulated image, audio, and video content is clearly and prominently labeled as artificially generated or manipulated.",
+        description:
+          "Visible, prominent labeling applied to AI-generated or substantially manipulated media.",
+      },
+      {
+        order_no: 2,
+        title:
+          "The labeling is machine-readable where technically feasible, using standardized metadata or watermarking.",
+        description:
+          "Machine-readable provenance metadata (e.g. C2PA) or watermarking applied where technically feasible.",
+      },
+      {
+        order_no: 3,
+        title:
+          "An exception applies only where the content is part of a manifestly artistic, creative, satirical, or fictional work, and does not affect the obligation to label for downstream recipients.",
+        description:
+          "Exception scope documented and not permitted to suppress downstream disclosure obligations.",
+      },
+    ],
+  },
+  {
+    order_no: 7,
+    title:
+      "Label AI-generated text published to inform the public on matters of public interest.",
+    description:
+      "AI-generated text disclosure when publishing on matters of public interest (Art 50.4).",
+    article: "Art. 50(4)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "AI-generated text that is published for the purpose of informing the public on matters of public interest is labeled as artificially generated, unless it has undergone human review and editorial control and a natural person holds editorial responsibility.",
+        description:
+          "Editorial workflow either labels AI-generated text or records the named natural person holding editorial responsibility.",
+      },
+    ],
+  },
 ];
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/13-general-purpose-ai.control.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/13-general-purpose-ai.control.ts
index d603966f85..aeb6e7faf6 100644
--- a/Servers/structures/EU-AI-Act/compliance-tracker/controls/13-general-purpose-ai.control.ts
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/13-general-purpose-ai.control.ts
@@ -1,103 +1,142 @@
 export const GeneralPurposeAImodels = [
   {
     order_no: 1,
-    title: "Unexpected Impact Integration",
+    title:
+      "Classify general-purpose AI models and determine whether they pose systemic risk.",
     description:
-      "Report any serious incidents involving AI systems to relevant market surveillance authorities within specified timeframes.",
-    implementation_details: "Implementation of automated incident reporting system in progress",
+      "Assess each GPAI model against the systemic-risk threshold and maintain classification documentation (Art 51).",
+    article: "Art. 51",
     subControls: [
       {
         order_no: 1,
         title:
-          "We implement processes to capture and integrate unexpected impact inputs.",
+          "We have assessed whether any GPAI model meets the systemic risk threshold (cumulative compute >10^25 FLOPs, or Commission designation).",
         description:
-          "Capturing unforeseen impacts helps refine systems and address emerging risks proactively.",
-        implementation_details: "Implemented a system to track and assess unexpected impacts based on user feedback and ongoing data analysis.",
-        evidence_description: "Impact reports and integration processes",
-        feedback_description: "Positive feedback from risk management team regarding the process",
+          "Compute budget estimates, designation notifications, and threshold assessment records are retained per model.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We maintain documentation of the classification determination and update it when model capabilities or compute thresholds change.",
+        description:
+          "Versioned classification record with review triggers on capability upgrades or regulatory threshold changes.",
       },
     ],
   },
   {
     order_no: 2,
-    title: "AI Model Capability Assessment",
+    title:
+      "Maintain technical documentation and provide information to downstream AI system providers.",
     description:
-      "Conduct comprehensive assessments of AI model capabilities using appropriate tools.",
-    implementation_details: "Conducting assessments to ensure AI models meet safety and quality standards.",
+      "Technical documentation and downstream transparency obligations for GPAI providers (Art 52.1.a-b).",
+    article: "Art. 52(1)(a)-(b)",
     subControls: [
       {
         order_no: 1,
-        title: "We assess AI model capabilities using appropriate tools.",
+        title:
+          "We have drawn up and maintain technical documentation of the model including training process, testing, and evaluation results, per Annex XI.",
+        description:
+          "Annex XI-compliant technical documentation covering training, testing, and evaluation is maintained and kept current.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We provide downstream AI system providers with sufficient information and documentation to understand the model's capabilities and limitations and comply with their own obligations.",
         description:
-          "Capability assessments verify that AI models perform as intended and meet required safety and quality standards.",
-        implementation_details: "Utilized testing frameworks and tools such as ModelValidator to ensure AI models meet the standards.",
-        evidence_description: "Assessment reports and tool outputs",
-        feedback_description: "Satisfactory evaluations from model assessment team",
+          "Model cards, API documentation, and usage guidance are published for downstream providers with capability and limitation disclosures.",
+      },
+      {
+        order_no: 3,
+        title:
+          "We maintain an up-to-date technical summary of the model's characteristics available to the AI Office upon request.",
+        description:
+          "Standing technical summary retained and updated on capability changes; available within required response timeframes.",
       },
     ],
   },
   {
     order_no: 3,
-    title: "Post-Deployment Incident Monitoring",
+    title:
+      "Establish a copyright compliance policy and publish a training content summary.",
     description:
-      "Monitor incidents related to AI systems and respond post-deployment.",
-    implementation_details: "Setting up monitoring infrastructure for incident response.",
+      "Copyright compliance policy and publicly available training data summary (Art 52.1.c-d).",
+    article: "Art. 52(1)(c)-(d)",
     subControls: [
       {
         order_no: 1,
-        title: "We develop plans to address unexpected risks as they arise.",
+        title:
+          "We have established and implemented a policy to comply with Union copyright law, including the text and data mining opt-out mechanism under Directive (EU) 2019/790.",
         description:
-          "Proactive risk plans ensure quick and effective responses to emerging challenges or unforeseen issues.",
-        implementation_details: "Developing risk mitigation plans with predefined action steps based on AI system performance.",
-        evidence_description: "Draft risk response plans and simulation results",
-        feedback_description: "Awaiting feedback from senior management",
+          "Documented copyright policy covering TDM opt-out honouring, takedown procedures, and attribution practices.",
       },
       {
         order_no: 2,
-        title: "We monitor and respond to incidents post-deployment.",
+        title:
+          "We have drawn up and made publicly available a sufficiently detailed summary of the content used for training the model, following the template provided by the AI Office.",
         description:
-          "Post-deployment monitoring identifies and mitigates issues, ensuring continued compliance and system reliability.",
-        implementation_details: "Implemented a continuous monitoring system that tracks key AI performance metrics post-deployment.",
-        evidence_description: "Incident logs and resolution reports",
-        feedback_description: "No major incidents, ongoing system reliability",
+          "Published training-data summary aligned to AI Office template; accessibility and language coverage evidenced.",
       },
     ],
   },
   {
     order_no: 4,
-    title: "AI System Logging Implementation",
+    title:
+      "Assess and mitigate systemic risks for models classified as posing systemic risk.",
     description:
-      "Ensure providers implement systems for capturing and storing AI system logs.",
-    implementation_details: "Implementing logging systems for traceability and compliance.",
+      "Systemic-risk obligations for GPAI-with-systemic-risk providers: evaluation, risk assessment, incident reporting, cybersecurity (Art 53).",
+    article: "Art. 53",
     subControls: [
       {
         order_no: 1,
         title:
-          "We ensure providers implement systems for capturing and storing AI system logs.",
+          "We perform model evaluations including adversarial testing to identify and mitigate systemic risks.",
         description:
-          "Logging systems provide traceability, aiding audits and troubleshooting while supporting regulatory requirements.",
-        implementation_details: "Collaborating with third-party providers to integrate logging systems that comply with industry standards.",
-        evidence_description: "Integration plans and log system designs",
-        feedback_description: "Providers are reviewing final implementation details",
+          "Documented evaluation methodology (red-teaming, adversarial probes) with periodic cadence.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We have assessed possible systemic risks, including their sources, that may stem from the development, placing on the market, or use of the model.",
+        description:
+          "Systemic risk register with sources, scenarios, and mitigation coverage.",
+      },
+      {
+        order_no: 3,
+        title:
+          "We track, document, and report serious incidents and possible corrective measures to the AI Office and relevant national authorities without undue delay.",
+        description:
+          "Incident management process with reporting channels to the AI Office and NCAs, with retention of corrective-measure records.",
+      },
+      {
+        order_no: 4,
+        title:
+          "We ensure an adequate level of cybersecurity protection for the model and its physical infrastructure.",
+        description:
+          "Cybersecurity controls covering weights protection, infrastructure hardening, and access governance.",
       },
     ],
   },
   {
     order_no: 5,
-    title: "Serious Incident Immediate Reporting",
+    title:
+      "Appoint an EU authorized representative (if non-EU provider) and adhere to codes of practice.",
     description:
-      "Immediately report serious incidents to providers, importers, distributors, and authorities.",
-    implementation_details: "Establishing processes for immediate reporting of serious incidents.",
+      "Authorized representative mandate and participation in codes of practice (Art 54-55).",
+    article: "Art. 54-55",
     subControls: [
       {
         order_no: 1,
         title:
-          "We immediately report serious incidents to providers, importers, distributors, and relevant authorities.",
+          "If established outside the Union, we have appointed an authorized representative established in the Union before making a GPAI model available on the Union market.",
+        description:
+          "Written mandate to EU representative covering compliance verification, documentation custody, and authority cooperation.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We participate in or adhere to codes of practice covering the obligations in Articles 52 and 53, or demonstrate equivalent alternative means of compliance.",
         description:
-          "Prompt reporting ensures accountability and timely resolution of incidents, minimizing potential harm.",
-        implementation_details: "Established a reporting protocol with clear guidelines for immediate incident escalation.",
-        evidence_description: "Incident reports and confirmation receipts from authorities",
-        feedback_description: "Fast response and resolution for all reported incidents",
+          "Evidence of code-of-practice participation or a documented equivalent-compliance plan.",
       },
     ],
   },
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/14-risk-classification.controls.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/14-risk-classification.controls.ts
new file mode 100644
index 0000000000..146e9a2797
--- /dev/null
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/14-risk-classification.controls.ts
@@ -0,0 +1,57 @@
+export const RiskClassification = [
+  {
+    order_no: 1,
+    title:
+      "Determine whether the AI system is a safety component of, or is itself, a product covered by EU harmonization legislation listed in Annex I.",
+    description:
+      "Annex I product-safety classification: assess and document whether the system is a safety component of, or a product covered by, Annex I legislation (Art 6.1).",
+    article: "Art. 6(1)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have assessed whether the AI system falls under Annex I product safety legislation (machinery, toys, lifts, medical devices, vehicles, aviation, marine equipment, etc.).",
+        description:
+          "Annex I applicability assessment report per AI system.",
+      },
+      {
+        order_no: 2,
+        title:
+          "If the system is a safety component or requires third-party conformity assessment under Annex I legislation, we have classified it as high-risk.",
+        description:
+          "Classification record referencing the applicable Annex I sectoral legislation and its conformity assessment path.",
+      },
+    ],
+  },
+  {
+    order_no: 2,
+    title:
+      "Determine whether the AI system falls into a high-risk use case listed in Annex III.",
+    description:
+      "Annex III standalone high-risk classification across the eight listed areas, plus Art 6(3) derogation assessment (Art 6.2-3, Art 7).",
+    article: "Art. 6(2)-(3), Art. 7",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have assessed the AI system against all eight Annex III areas: (1) biometrics, (2) critical infrastructure, (3) education and vocational training, (4) employment and worker management, (5) access to essential services, (6) law enforcement, (7) migration/asylum/border control, (8) administration of justice and democratic processes.",
+        description:
+          "Per-area assessment documenting whether each AI system maps to an Annex III use case.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We have documented the classification determination including the specific Annex III area and use case.",
+        description:
+          "Classification register with Annex III area, specific use case, and supporting rationale.",
+      },
+      {
+        order_no: 3,
+        title:
+          "If the system performs a narrow procedural task, improves a previous human activity, detects decision patterns without replacing human assessment, or performs a preparatory task, we have assessed whether the Art 6(3) exception applies and documented the reasoning.",
+        description:
+          "Art 6(3) exception evaluation with explicit reasoning against each of the four exception criteria.",
+      },
+    ],
+  },
+];
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/15-quality-management-system.controls.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/15-quality-management-system.controls.ts
new file mode 100644
index 0000000000..5559f1b755
--- /dev/null
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/15-quality-management-system.controls.ts
@@ -0,0 +1,128 @@
+export const QualityManagementSystem = [
+  {
+    order_no: 1,
+    title:
+      "Establish and maintain a quality management system documented in a systematic and orderly manner in the form of written policies, procedures, and instructions.",
+    description:
+      "QMS establishment covering every element required by Art 17.1.a-m.",
+    article: "Art. 17(1)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have a documented QMS that covers the strategy for regulatory compliance, including conformity assessment procedures and procedures for the management of modifications to the high-risk AI system.",
+        description:
+          "Regulatory compliance strategy, conformity procedures, and modification management procedures are documented (Art 17.1.a-b).",
+      },
+      {
+        order_no: 2,
+        title:
+          "Our QMS includes documented design and development procedures, including design control and design verification.",
+        description:
+          "Design-control and design-verification procedures documented (Art 17.1.c).",
+      },
+      {
+        order_no: 3,
+        title:
+          "Our QMS includes testing and validation procedures before, during, and after development, and the frequency of these tests.",
+        description:
+          "Testing and validation procedures covering pre-, during-, and post-development phases with defined frequency (Art 17.1.d).",
+      },
+      {
+        order_no: 4,
+        title:
+          "Our QMS includes technical specifications including standards to be applied, and where relevant harmonized standards are not fully applied, the means to ensure the system meets applicable requirements.",
+        description:
+          "Technical specification register with standards mapping and equivalence rationale where harmonized standards are not fully applied (Art 17.1.e).",
+      },
+      {
+        order_no: 5,
+        title:
+          "Our QMS includes data management procedures covering data collection, analysis, labeling, storage, filtration, mining, aggregation, retention, and any other operation regarding data for training, validation, and testing.",
+        description:
+          "Data management procedures covering the full data lifecycle for training, validation, and testing data (Art 17.1.f).",
+      },
+      {
+        order_no: 6,
+        title: "Our QMS includes a risk management system per Article 9.",
+        description:
+          "Cross-reference to the Art 9 risk management system embedded in the QMS (Art 17.1.g).",
+      },
+      {
+        order_no: 7,
+        title: "Our QMS includes a post-market monitoring system per Article 72.",
+        description:
+          "Cross-reference to the Art 72 post-market monitoring system embedded in the QMS (Art 17.1.h).",
+      },
+      {
+        order_no: 8,
+        title:
+          "Our QMS includes procedures for reporting serious incidents per Article 73.",
+        description:
+          "Serious incident reporting procedures embedded in the QMS (Art 17.1.i).",
+      },
+      {
+        order_no: 9,
+        title:
+          "Our QMS includes communication procedures with national competent authorities, notified bodies, other operators, and customers.",
+        description:
+          "Regulator, notified body, operator, and customer communication procedures (Art 17.1.j).",
+      },
+      {
+        order_no: 10,
+        title:
+          "Our QMS includes systems and procedures for record-keeping of relevant documentation and information.",
+        description:
+          "Record-keeping systems and retention procedures are documented (Art 17.1.k).",
+      },
+      {
+        order_no: 11,
+        title:
+          "Our QMS includes resource management procedures, including supply-chain related measures.",
+        description:
+          "Resource and supply-chain management procedures (Art 17.1.l).",
+      },
+      {
+        order_no: 12,
+        title:
+          "Our QMS includes an accountability framework for management and other staff regarding all aspects of the QMS.",
+        description:
+          "Role-based accountability framework covering management and staff QMS obligations (Art 17.1.m).",
+      },
+    ],
+  },
+  {
+    order_no: 2,
+    title:
+      "Implement QMS measures proportionate to the size of the organization, taking into account simplified requirements for SMEs.",
+    description:
+      "QMS proportionality assessment and SME simplification where applicable (Art 17.2).",
+    article: "Art. 17(2)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have assessed the proportionality of our QMS measures relative to our organization's size and the nature of our AI systems.",
+        description:
+          "Proportionality assessment records referencing organization size, AI-system criticality, and SME status where applicable.",
+      },
+    ],
+  },
+  {
+    order_no: 3,
+    title:
+      "For providers subject to sectoral Union legislation, integrate AI Act QMS elements into existing quality management obligations.",
+    description:
+      "Integration of AI Act QMS elements into existing sectoral QMS frameworks (Art 17.3).",
+    article: "Art. 17(3)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "If we are already subject to sectoral QMS requirements (medical devices, automotive, etc.), we have integrated the AI Act QMS elements into our existing quality management system.",
+        description:
+          "QMS integration map showing AI Act elements mapped to existing sectoral QMS processes.",
+      },
+    ],
+  },
+];
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/16-provider-documentation.controls.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/16-provider-documentation.controls.ts
new file mode 100644
index 0000000000..6e0a71609d
--- /dev/null
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/16-provider-documentation.controls.ts
@@ -0,0 +1,202 @@
+export const ProviderDocumentation = [
+  {
+    order_no: 1,
+    title:
+      "Establish, implement, document, and maintain a continuous iterative risk management system throughout the entire lifecycle of the high-risk AI system.",
+    description:
+      "Risk management system across the entire AI lifecycle covering identification, analysis, treatment, and residual-risk evaluation (Art 9).",
+    article: "Art. 9",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have established a risk management system that identifies and analyzes known and reasonably foreseeable risks to health, safety, or fundamental rights.",
+        description:
+          "Risk register covering health, safety, and fundamental rights impacts with analysis records (Art 9.2.a).",
+      },
+      {
+        order_no: 2,
+        title:
+          "We estimate and evaluate the risks that may emerge when the system is used in accordance with its intended purpose and under conditions of reasonably foreseeable misuse.",
+        description:
+          "Risk evaluation covering intended-use and foreseeable-misuse scenarios (Art 9.2.b).",
+      },
+      {
+        order_no: 3,
+        title:
+          "We evaluate risks arising from analysis of data gathered from the post-market monitoring system.",
+        description:
+          "Feedback loop from Art 72 post-market monitoring into the Art 9 risk system (Art 9.2.c).",
+      },
+      {
+        order_no: 4,
+        title:
+          "We adopt risk management measures that consist of elimination or reduction of risks through adequate design and development, and where appropriate, implementation of adequate mitigation and control measures.",
+        description:
+          "Design-based risk controls and complementary mitigation/control measures documented per risk (Art 9.4).",
+      },
+      {
+        order_no: 5,
+        title:
+          "Testing procedures are suitable to identify the most appropriate and targeted risk management measures.",
+        description:
+          "Testing procedures are designed to evaluate risk-control effectiveness (Art 9.5).",
+      },
+      {
+        order_no: 6,
+        title:
+          "We test the high-risk AI system against preliminarily defined metrics and probabilistic thresholds appropriate to the intended purpose.",
+        description:
+          "Pre-defined metrics and probabilistic acceptance thresholds used for system testing (Art 9.6).",
+      },
+      {
+        order_no: 7,
+        title:
+          "Residual risks associated with each hazard and the overall residual risk are judged to be acceptable.",
+        description:
+          "Residual risk acceptance records signed off by the risk owner (Art 9.7).",
+      },
+    ],
+  },
+  {
+    order_no: 2,
+    title:
+      "Ensure training, validation, and testing datasets meet quality criteria and are subject to appropriate data governance practices.",
+    description:
+      "Data governance covering design choices, collection, preparation, representativeness, bias detection, and special-category data handling (Art 10).",
+    article: "Art. 10",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have documented data governance practices covering design choices, data collection processes, data preparation operations, assumptions, prior assessments of data availability and suitability, examination for possible biases, and identification of relevant data gaps or shortcomings.",
+        description:
+          "Data governance records covering each element of Art 10.2 for training, validation, and testing datasets.",
+      },
+      {
+        order_no: 2,
+        title:
+          "Training, validation, and testing datasets are relevant, sufficiently representative, and as free of errors and as complete as possible in view of the intended purpose.",
+        description:
+          "Dataset quality attestations covering relevance, representativeness, error rate, and completeness (Art 10.3).",
+      },
+      {
+        order_no: 3,
+        title:
+          "Datasets take into account the specific geographical, contextual, behavioral, or functional setting within which the high-risk AI system is intended to be used.",
+        description:
+          "Context-of-use documentation describing geographical, contextual, behavioral, and functional coverage of datasets (Art 10.4).",
+      },
+      {
+        order_no: 4,
+        title:
+          "Where strictly necessary for bias detection and correction, the provider may process special categories of personal data subject to appropriate safeguards for fundamental rights.",
+        description:
+          "Safeguards and legal basis for any processing of special categories of personal data for bias detection/correction (Art 10.5).",
+      },
+    ],
+  },
+  {
+    order_no: 3,
+    title:
+      "Draw up technical documentation before placing on market or putting into service, and keep it up to date.",
+    description:
+      "Annex IV technical documentation covering system description, lifecycle changes, risk management, standards applied, and EU declaration of conformity (Art 11).",
+    article: "Art. 11",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have drawn up technical documentation demonstrating compliance with requirements in Chapter III Section 2, and providing authorities and notified bodies with all necessary information to assess compliance.",
+        description:
+          "Chapter III Section 2 compliance evidence maintained for authority/notified-body review (Art 11.1).",
+      },
+      {
+        order_no: 2,
+        title:
+          "Technical documentation includes: general description, detailed description of elements and development process, information about monitoring/functioning/control, description of the risk management system, description of relevant changes made through the system's lifecycle, list of harmonized standards applied, and a copy of the EU declaration of conformity (Annex IV).",
+        description:
+          "Annex IV-aligned technical documentation covering all required sections.",
+      },
+    ],
+  },
+  {
+    order_no: 4,
+    title:
+      "Design high-risk AI systems with logging capabilities enabling the recording of events relevant for identifying risk and facilitating post-market monitoring.",
+    description:
+      "Automatic logging of relevant events across the system lifecycle (Art 12).",
+    article: "Art. 12",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "The logging capabilities enable recording of the period of each use, the reference database against which input data has been checked, input data for which the search has led to a match, and the identification of natural persons involved in the verification of results.",
+        description:
+          "Log schema captures usage periods, reference databases, matched inputs, and verifier identities where applicable (Art 12.2).",
+      },
+      {
+        order_no: 2,
+        title:
+          "Logging is proportionate to the intended purpose and the applicable legal obligations under Union or national law.",
+        description:
+          "Logging configuration and retention documented with proportionality rationale (Art 12.3).",
+      },
+    ],
+  },
+  {
+    order_no: 5,
+    title:
+      "Design high-risk AI systems to achieve an appropriate level of accuracy, robustness, and cybersecurity and to perform consistently in those respects throughout their lifecycle.",
+    description:
+      "Accuracy, robustness, and cybersecurity requirements and AI-specific vulnerability controls (Art 15).",
+    article: "Art. 15",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "Levels of accuracy and the relevant accuracy metrics are declared in the instructions for use.",
+        description:
+          "Accuracy levels and metrics declared in end-user instructions (Art 15.2).",
+      },
+      {
+        order_no: 2,
+        title:
+          "The system is designed to be resilient regarding errors, faults, or inconsistencies in the environment, and is robust with regard to unauthorized third-party attempts to alter its use, outputs, or performance.",
+        description:
+          "Resilience and robustness controls against environmental errors and unauthorized alteration (Art 15.4).",
+      },
+      {
+        order_no: 3,
+        title:
+          "Technical solutions to address AI-specific vulnerabilities include measures to prevent, detect, respond to, resolve, and control for data poisoning attacks, model poisoning, adversarial examples or model evasion, confidentiality attacks, or model flaws.",
+        description:
+          "AI-specific security controls for data/model poisoning, adversarial examples, confidentiality attacks, and model flaws (Art 15.5).",
+      },
+    ],
+  },
+  {
+    order_no: 6,
+    title:
+      "Keep technical documentation and automatically generated logs available for the period required by law.",
+    description:
+      "Retention of technical documentation and automatic logs (Art 18-19).",
+    article: "Art. 18-19",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "Technical documentation is kept at the disposal of national competent authorities for a period of 10 years after the system has been placed on the market or put into service.",
+        description:
+          "10-year retention and accessibility procedures for technical documentation (Art 18.1).",
+      },
+      {
+        order_no: 2,
+        title:
+          "Automatically generated logs are kept for a period appropriate to the intended purpose of the high-risk AI system, of at least six months unless provided otherwise in applicable Union or national law.",
+        description:
+          "Log retention policy covering the Art 19 minimum and any sector-specific extensions.",
+      },
+    ],
+  },
+];
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/17-conformity-and-market-access.controls.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/17-conformity-and-market-access.controls.ts
new file mode 100644
index 0000000000..9bc4d84293
--- /dev/null
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/17-conformity-and-market-access.controls.ts
@@ -0,0 +1,104 @@
+export const ConformityAndMarketAccess = [
+  {
+    order_no: 1,
+    title:
+      "Non-EU providers must appoint an authorized representative established in the Union before placing a high-risk AI system on the market.",
+    description:
+      "Authorized representative appointment and mandate requirements for non-EU providers (Art 22).",
+    article: "Art. 22",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "If established outside the Union, we have appointed an authorized representative in the Union by written mandate.",
+        description:
+          "Written mandate appointing the EU authorized representative prior to market placement (Art 22.1).",
+      },
+      {
+        order_no: 2,
+        title:
+          "The authorized representative is mandated to: verify the EU declaration of conformity and technical documentation have been drawn up, keep a copy of the EU declaration and technical documentation at the disposal of authorities for 10 years, provide authorities with all information and documentation necessary to demonstrate conformity, and cooperate with authorities on any action they take.",
+        description:
+          "Authorized representative's mandated tasks documented in the representation agreement (Art 22.2).",
+      },
+    ],
+  },
+  {
+    order_no: 2,
+    title:
+      "Complete the applicable conformity assessment procedure before placing the system on the market or putting it into service.",
+    description:
+      "Conformity assessment procedure determination, execution, and re-execution on substantial modification (Art 43).",
+    article: "Art. 43",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have determined whether the conformity assessment procedure is based on internal control (Annex VI) or involves assessment by a notified body (Annex VII), based on the specific high-risk classification.",
+        description:
+          "Conformity assessment route determination with justification (Annex VI vs VII).",
+      },
+      {
+        order_no: 2,
+        title:
+          "Where the AI system is intended to be used for biometric categorization, emotion recognition, or any Annex III area requiring third-party assessment, we have engaged a notified body.",
+        description:
+          "Notified body engagement records for systems requiring third-party assessment.",
+      },
+      {
+        order_no: 3,
+        title:
+          "We repeat the conformity assessment procedure whenever a substantial modification is made to the system.",
+        description:
+          "Substantial-modification trigger process that re-runs the applicable conformity assessment.",
+      },
+    ],
+  },
+  {
+    order_no: 3,
+    title:
+      "Draw up a written or electronic EU declaration of conformity for each high-risk AI system and keep it at the disposal of authorities for 10 years.",
+    description:
+      "EU declaration of conformity contents and retention (Art 47, Annex V).",
+    article: "Art. 47",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "The EU declaration of conformity contains: name and type of the AI system, name and address of the provider, a statement that the EU declaration of conformity is issued under the sole responsibility of the provider, reference to harmonized standards or common specifications used, reference to any notified body involved, and a dated signature (Annex V).",
+        description:
+          "Annex V-compliant declaration template in use; retention procedures cover the 10-year period.",
+      },
+    ],
+  },
+  {
+    order_no: 4,
+    title:
+      "Affix the CE marking visibly, legibly, and indelibly to the high-risk AI system or its data plate/documentation.",
+    description:
+      "CE marking placement rules including documentation-only variants (Art 48).",
+    article: "Art. 48",
+    subControls: [
+      {
+        order_no: 1,
+        title: "The CE marking is affixed before the system is placed on the market.",
+        description:
+          "Pre-market CE marking affixation procedure in the release workflow.",
+      },
+      {
+        order_no: 2,
+        title:
+          "Where no physical product exists, the CE marking is included in the accompanying documentation.",
+        description:
+          "Documentation-based CE marking procedure for software-only systems.",
+      },
+      {
+        order_no: 3,
+        title:
+          "The CE marking is subject to the general principles set out in Article 30 of Regulation (EC) No 765/2008.",
+        description:
+          "Compliance with Regulation (EC) No 765/2008 Art 30 general principles verified.",
+      },
+    ],
+  },
+];
diff --git a/Servers/structures/EU-AI-Act/compliance-tracker/controls/18-deployer-data-rights.controls.ts b/Servers/structures/EU-AI-Act/compliance-tracker/controls/18-deployer-data-rights.controls.ts
new file mode 100644
index 0000000000..61fe4ca150
--- /dev/null
+++ b/Servers/structures/EU-AI-Act/compliance-tracker/controls/18-deployer-data-rights.controls.ts
@@ -0,0 +1,81 @@
+export const DeployerDataRights = [
+  {
+    order_no: 1,
+    title:
+      "Keep logs automatically generated by the high-risk AI system, to the extent such logs are under your control, for at least six months.",
+    description:
+      "Deployer log retention obligation for automatically generated logs under the deployer's control (Art 26.5).",
+    article: "Art. 26(5)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "We have established a log retention policy specifying the minimum retention period (6 months or as required by applicable sector-specific or national law).",
+        description:
+          "Documented log retention policy covering the 6-month minimum and any sectoral extensions.",
+      },
+      {
+        order_no: 2,
+        title:
+          "We have implemented technical measures to ensure automatic log storage and prevent premature deletion.",
+        description:
+          "Automated log capture, immutable storage, and deletion-protection controls.",
+      },
+    ],
+  },
+  {
+    order_no: 2,
+    title:
+      "Use information provided by the provider under Article 13 to comply with the obligation to carry out a data protection impact assessment under GDPR Article 35.",
+    description:
+      "Integration of Art 13 provider information into GDPR Article 35 DPIAs (Art 26.6).",
+    article: "Art. 26(6)",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "Before deploying the high-risk AI system, we have conducted or updated a DPIA that incorporates the AI system's data processing characteristics as described in the provider's instructions for use.",
+        description:
+          "Pre-deployment DPIA or DPIA update that incorporates the provider's instructions for use.",
+      },
+      {
+        order_no: 2,
+        title:
+          "The DPIA addresses the specific risks posed by AI-assisted decision-making to the rights and freedoms of natural persons.",
+        description:
+          "DPIA content explicitly addresses AI-specific risks to rights and freedoms of natural persons.",
+      },
+    ],
+  },
+  {
+    order_no: 3,
+    title:
+      "Provide affected persons with clear and meaningful explanations of the role of the AI system in the decision-making procedure and the main elements of the decision taken.",
+    description:
+      "Right to explanation for decisions with legal or similarly significant effects (Art 85).",
+    article: "Art. 85",
+    subControls: [
+      {
+        order_no: 1,
+        title:
+          "When a high-risk AI system is used to make or assist in making decisions that have legal effects or similarly significant effects on natural persons, we provide the affected person with an explanation of the AI system's role.",
+        description:
+          "Decision-point disclosure process describing the AI system's role in the decision.",
+      },
+      {
+        order_no: 2,
+        title:
+          "The explanation covers the main elements of the decision taken, including the role the AI system played, and is provided in a clear and meaningful manner.",
+        description:
+          "Explanation template covering decision elements, AI role, and user-appropriate language.",
+      },
+      {
+        order_no: 3,
+        title:
+          "We have established a process for affected persons to request and receive such explanations in a timely manner.",
+        description:
+          "Request-handling process with SLAs for delivering explanations to affected persons.",
+      },
+    ],
+  },
+];
diff --git a/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts b/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts
index cac33d3515..67e8c2683d 100644
--- a/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts
+++ b/Servers/structures/ISO-27001/annexes/iso27001.annex.struct.ts
@@ -324,29 +324,21 @@ export const ISO27001Annex = [
       },
       {
         index: 9,
-        title: "Inventory of information and assets",
+        title: "Inventory of information and other associated assets",
         requirement_summary:
-          "Implement clear and effective measures for 'Inventory of information and assets' as part of organizational controls to keep information secure.",
+          "Identify and maintain an inventory of information and other assets associated with information and information processing facilities, with assigned ownership.",
         key_questions: [
-          "Do we have a written, approved process for 'Inventory of information and assets'?",
-          "Who is responsible for ensuring 'Inventory of information and assets' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is there a current inventory of information assets and their associated supporting assets?",
+          "Has each asset been assigned an owner responsible for its security?",
+          "How often is the inventory reviewed for completeness and accuracy?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Asset inventory register with owners and classifications",
+          "Asset onboarding and offboarding procedures",
+          "Periodic inventory review records",
         ],
         implementation_description:
-          "Describe how 'Inventory of information and assets' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Maintain a live inventory of information assets (data, applications, infrastructure) and other associated assets (physical, services). Assign an owner to each and review the inventory on a defined cadence and on significant change.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -364,29 +356,21 @@ export const ISO27001Annex = [
       },
       {
         index: 10,
-        title: "Acceptable use of information and assets",
+        title: "Acceptable use of information and other associated assets",
         requirement_summary:
-          "Implement clear and effective measures for 'Acceptable use of information and assets' as part of organizational controls to keep information secure.",
+          "Identify, document and implement rules for the acceptable use and handling of information and other associated assets.",
         key_questions: [
-          "Do we have a written, approved process for 'Acceptable use of information and assets'?",
-          "Who is responsible for ensuring 'Acceptable use of information and assets' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are acceptable use rules documented for each asset class?",
+          "Have users formally acknowledged the acceptable use policy?",
+          "How do we detect and respond to unacceptable use?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Acceptable use policy",
+          "User acknowledgement records",
+          "Incidents or violations tracked against the policy",
         ],
         implementation_description:
-          "Describe how 'Acceptable use of information and assets' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Publish acceptable use rules that cover information, systems, and supporting assets. Communicate the rules to all users and contractors, obtain acknowledgement, and monitor for violations.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -524,29 +508,21 @@ export const ISO27001Annex = [
       },
       {
         index: 14,
-        title: "Handling of information",
+        title: "Information transfer",
         requirement_summary:
-          "Implement clear and effective measures for 'Handling of information' as part of organizational controls to keep information secure.",
+          "Establish rules, procedures, or agreements for transferring information within the organization and with any external party, covering all types of transfer facilities.",
         key_questions: [
-          "Do we have a written, approved process for 'Handling of information'?",
-          "Who is responsible for ensuring 'Handling of information' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are there rules governing information transfer by electronic, physical, and verbal means?",
+          "Do agreements with external parties cover secure information transfer?",
+          "Is information transferred with appropriate classification handling and encryption where needed?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Information transfer policy and procedures",
+          "Third-party transfer agreements",
+          "Encryption configuration for transfer channels",
         ],
         implementation_description:
-          "Describe how 'Handling of information' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Define and enforce rules for transferring information across all channels (electronic, physical, verbal). Use appropriate controls (encryption, authentication, secure messaging) and cover transfer in third-party agreements.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -564,29 +540,21 @@ export const ISO27001Annex = [
       },
       {
         index: 15,
-        title: "Access control policy",
+        title: "Access control",
         requirement_summary:
-          "Implement clear and effective measures for 'Access control policy' as part of organizational controls to keep information secure.",
+          "Establish and implement rules for physical and logical access to information and other associated assets based on business and information security requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Access control policy'?",
-          "Who is responsible for ensuring 'Access control policy' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is an access control policy documented and approved?",
+          "Are access decisions based on business need, data classification, and risk?",
+          "Is access reviewed periodically and revoked when no longer needed?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Access control policy",
+          "Role/permission matrix",
+          "Periodic access review records",
         ],
         implementation_description:
-          "Describe how 'Access control policy' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Document an access control policy covering logical and physical access. Apply least privilege and need-to-know, review access periodically, and update access rights promptly when roles change.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -604,29 +572,21 @@ export const ISO27001Annex = [
       },
       {
         index: 16,
-        title: "Access to networks and network services",
+        title: "Identity management",
         requirement_summary:
-          "Implement clear and effective measures for 'Access to networks and network services' as part of organizational controls to keep information secure.",
+          "Manage the full lifecycle of identities used to access information and other associated assets — creation, verification, use, suspension, and removal.",
         key_questions: [
-          "Do we have a written, approved process for 'Access to networks and network services'?",
-          "Who is responsible for ensuring 'Access to networks and network services' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "How are identities created, verified, and approved?",
+          "Are identities uniquely attributable to a single person, service, or device?",
+          "Are inactive or unneeded identities suspended or removed promptly?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Identity provisioning and deprovisioning procedures",
+          "Identity register and audit logs",
+          "Records of suspended or removed identities",
         ],
         implementation_description:
-          "Describe how 'Access to networks and network services' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Operate an identity lifecycle that covers request, verification, provisioning, maintenance, suspension, and deletion. Ensure each identity is uniquely attributable and that stale identities are removed promptly.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -644,29 +604,21 @@ export const ISO27001Annex = [
       },
       {
         index: 17,
-        title: "User registration and de-registration",
+        title: "Authentication information",
         requirement_summary:
-          "Implement clear and effective measures for 'User registration and de-registration' as part of organizational controls to keep information secure.",
+          "Manage the allocation and management of authentication information through a defined process, including initial allocation, replacement, and temporary credentials.",
         key_questions: [
-          "Do we have a written, approved process for 'User registration and de-registration'?",
-          "Who is responsible for ensuring 'User registration and de-registration' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "How is authentication information issued, replaced, and retired?",
+          "Are strong authentication mechanisms used where risk warrants?",
+          "Are users educated on the confidentiality of their authentication information?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Authentication information management procedure",
+          "MFA configuration records",
+          "User awareness materials on credential hygiene",
         ],
         implementation_description:
-          "Describe how 'User registration and de-registration' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Allocate authentication information through a controlled process, use MFA where appropriate, protect stored authentication data, and require prompt change on suspected compromise.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -684,29 +636,21 @@ export const ISO27001Annex = [
       },
       {
         index: 18,
-        title: "Management of privileged access rights",
+        title: "Access rights",
         requirement_summary:
-          "Implement clear and effective measures for 'Management of privileged access rights' as part of organizational controls to keep information secure.",
+          "Provision, review, modify, and remove access rights to information and other associated assets in line with the access control policy.",
         key_questions: [
-          "Do we have a written, approved process for 'Management of privileged access rights'?",
-          "Who is responsible for ensuring 'Management of privileged access rights' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are access rights granted based on approved requests tied to the access control policy?",
+          "Are privileged access rights assigned restrictively and recorded separately?",
+          "Are access rights reviewed at planned intervals and on role changes?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Access request and approval records",
+          "Privileged access register",
+          "Periodic access review outcomes",
         ],
         implementation_description:
-          "Describe how 'Management of privileged access rights' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Grant, review, modify, and revoke access rights through a documented workflow. Maintain a separate register for privileged access, and perform reviews at planned intervals and on job changes.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -724,29 +668,21 @@ export const ISO27001Annex = [
       },
       {
         index: 19,
-        title: "Management of secret authentication information",
+        title: "Information security in supplier relationships",
         requirement_summary:
-          "Implement clear and effective measures for 'Management of secret authentication information' as part of organizational controls to keep information secure.",
+          "Define and implement processes and procedures to manage information security risks associated with the use of supplier products and services.",
         key_questions: [
-          "Do we have a written, approved process for 'Management of secret authentication information'?",
-          "Who is responsible for ensuring 'Management of secret authentication information' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Have we identified suppliers whose access or services affect information security?",
+          "Are security requirements defined based on the risk of each supplier relationship?",
+          "Do we monitor supplier compliance against those requirements?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Supplier security policy",
+          "Supplier risk register",
+          "Supplier security assessments",
         ],
         implementation_description:
-          "Describe how 'Management of secret authentication information' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Classify suppliers by the risk they pose to information security, define security requirements proportional to that risk, and monitor supplier compliance over the life of the relationship.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -764,29 +700,21 @@ export const ISO27001Annex = [
       },
       {
         index: 20,
-        title: "Review of user access rights",
+        title: "Addressing information security within supplier agreements",
         requirement_summary:
-          "Implement clear and effective measures for 'Review of user access rights' as part of organizational controls to keep information secure.",
+          "Establish and agree relevant information security requirements with each supplier based on the type of supplier relationship.",
         key_questions: [
-          "Do we have a written, approved process for 'Review of user access rights'?",
-          "Who is responsible for ensuring 'Review of user access rights' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Do supplier agreements include specific information security clauses?",
+          "Are incident notification and audit rights included where appropriate?",
+          "Are confidentiality and data handling clauses aligned to our classification scheme?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Template supplier security agreement",
+          "Signed supplier contracts with security clauses",
+          "Incident notification clauses and invocation records",
         ],
         implementation_description:
-          "Describe how 'Review of user access rights' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Maintain template security clauses for supplier agreements covering confidentiality, incident notification, audit, subcontracting, and termination. Customize per supplier risk and ensure formal sign-off.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -804,29 +732,21 @@ export const ISO27001Annex = [
       },
       {
         index: 21,
-        title: "Removal or adjustment of access rights",
+        title: "Managing information security in the ICT supply chain",
         requirement_summary:
-          "Implement clear and effective measures for 'Removal or adjustment of access rights' as part of organizational controls to keep information secure.",
+          "Define and implement processes and requirements for managing information security risks associated with the ICT products and services supply chain.",
         key_questions: [
-          "Do we have a written, approved process for 'Removal or adjustment of access rights'?",
-          "Who is responsible for ensuring 'Removal or adjustment of access rights' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Have we identified ICT supply-chain dependencies that affect security?",
+          "Do we require suppliers to propagate security requirements to their subcontractors?",
+          "Are we monitoring for supply-chain vulnerabilities (e.g., known vendor incidents)?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "ICT supply-chain risk register",
+          "Flow-down security requirements in supplier contracts",
+          "Supply-chain vulnerability monitoring reports",
         ],
         implementation_description:
-          "Describe how 'Removal or adjustment of access rights' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Map ICT supply-chain dependencies, require supplier flow-down of security obligations to subcontractors, and monitor for vulnerabilities in third-party ICT components.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -844,29 +764,21 @@ export const ISO27001Annex = [
       },
       {
         index: 22,
-        title: "Use of secret authentication information",
+        title: "Monitoring, review and change management of supplier services",
         requirement_summary:
-          "Implement clear and effective measures for 'Use of secret authentication information' as part of organizational controls to keep information secure.",
+          "Regularly monitor, review, evaluate, and manage changes to supplier information security practices and service delivery.",
         key_questions: [
-          "Do we have a written, approved process for 'Use of secret authentication information'?",
-          "Who is responsible for ensuring 'Use of secret authentication information' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are suppliers reviewed on a risk-based cadence?",
+          "Do we track service delivery against SLAs and security metrics?",
+          "Are supplier changes assessed for security impact before acceptance?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Supplier review schedule and meeting minutes",
+          "Service delivery and SLA reports",
+          "Supplier change assessment records",
         ],
         implementation_description:
-          "Describe how 'Use of secret authentication information' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Schedule supplier reviews, track SLA and security metrics, and evaluate supplier changes (e.g., new subcontractors, service scope changes) for security impact before acceptance.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -884,29 +796,21 @@ export const ISO27001Annex = [
       },
       {
         index: 23,
-        title: "Information security in supplier relationships",
+        title: "Information security for use of cloud services",
         requirement_summary:
-          "Implement clear and effective measures for 'Information security in supplier relationships' as part of organizational controls to keep information secure.",
+          "Establish processes for the acquisition, use, management, and exit of cloud services in line with information security requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Information security in supplier relationships'?",
-          "Who is responsible for ensuring 'Information security in supplier relationships' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Do we maintain an inventory of cloud services in use?",
+          "Are security requirements defined for each cloud service (identity, data protection, logging, exit)?",
+          "Have we planned for secure exit (data portability and deletion) from each provider?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Cloud service inventory",
+          "Cloud security requirements and provider assessments",
+          "Exit plans and data portability procedures",
         ],
         implementation_description:
-          "Describe how 'Information security in supplier relationships' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Maintain a cloud service inventory, define per-service security requirements (identity, encryption, logging, data residency), and plan for orderly exit including data portability and deletion.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -924,29 +828,21 @@ export const ISO27001Annex = [
       },
       {
         index: 24,
-        title: "Addressing information security within supplier agreements",
+        title: "Information security incident management planning and preparation",
         requirement_summary:
-          "Implement clear and effective measures for 'Addressing information security within supplier agreements' as part of organizational controls to keep information secure.",
+          "Plan and prepare for managing information security incidents by defining, establishing, and communicating incident management processes, roles, and responsibilities.",
         key_questions: [
-          "Do we have a written, approved process for 'Addressing information security within supplier agreements'?",
-          "Who is responsible for ensuring 'Addressing information security within supplier agreements' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is there an approved incident management plan covering detection, response, and recovery?",
+          "Are roles, responsibilities, and escalation paths defined?",
+          "Are incident response procedures exercised at planned intervals?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Incident management plan",
+          "Incident response RACI",
+          "Tabletop exercise results",
         ],
         implementation_description:
-          "Describe how 'Addressing information security within supplier agreements' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Publish an incident management plan with defined roles, communication paths, and playbooks. Train responders and exercise the plan at planned intervals to maintain readiness.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -964,29 +860,21 @@ export const ISO27001Annex = [
       },
       {
         index: 25,
-        title: "Information and communication technology supply chain security",
+        title: "Assessment and decision on information security events",
         requirement_summary:
-          "Implement clear and effective measures for 'Information and communication technology supply chain security' as part of organizational controls to keep information secure.",
+          "Assess information security events and decide whether they should be classified as information security incidents.",
         key_questions: [
-          "Do we have a written, approved process for 'Information and communication technology supply chain security'?",
-          "Who is responsible for ensuring 'Information and communication technology supply chain security' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is there a documented triage process for classifying events?",
+          "Are classification decisions recorded with rationale?",
+          "Do we feed classification outcomes back into detection tuning?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Event triage procedure",
+          "Event classification decision log",
+          "Detection tuning records tied to classification outcomes",
         ],
         implementation_description:
-          "Describe how 'Information and communication technology supply chain security' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Triage detected events using defined criteria, classify them as incidents or non-incidents with recorded rationale, and feed learnings back to improve detection and response.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1004,29 +892,20 @@ export const ISO27001Annex = [
       },
       {
         index: 26,
-        title: "Monitoring, review, and change management of supplier services",
-        requirement_summary:
-          "Implement clear and effective measures for 'Monitoring, review, and change management of supplier services' as part of organizational controls to keep information secure.",
+        title: "Response to information security incidents",
+        requirement_summary: "Respond to information security incidents in accordance with documented procedures.",
         key_questions: [
-          "Do we have a written, approved process for 'Monitoring, review, and change management of supplier services'?",
-          "Who is responsible for ensuring 'Monitoring, review, and change management of supplier services' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are incident response procedures followed consistently during events?",
+          "Are containment, eradication, recovery, and post-incident steps covered?",
+          "Are affected stakeholders notified according to policy and legal obligations?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Incident response procedures",
+          "Incident records with timelines and actions",
+          "Stakeholder notification logs",
         ],
         implementation_description:
-          "Describe how 'Monitoring, review, and change management of supplier services' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Run incidents through the documented playbook covering containment, eradication, recovery, and stakeholder communication. Record timelines, actions, and decisions for each incident.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1044,29 +923,21 @@ export const ISO27001Annex = [
       },
       {
         index: 27,
-        title: "Incident management responsibilities and procedures",
+        title: "Learning from information security incidents",
         requirement_summary:
-          "Implement clear and effective measures for 'Incident management responsibilities and procedures' as part of organizational controls to keep information secure.",
+          "Use knowledge gained from information security incidents to strengthen controls and reduce the likelihood or impact of future incidents.",
         key_questions: [
-          "Do we have a written, approved process for 'Incident management responsibilities and procedures'?",
-          "Who is responsible for ensuring 'Incident management responsibilities and procedures' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Do we conduct post-incident reviews for significant incidents?",
+          "Are lessons learned tracked to closure as control improvements?",
+          "Are common themes analyzed across incidents to identify systemic issues?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Post-incident review reports",
+          "Lessons-learned action register",
+          "Trend analysis across incidents",
         ],
         implementation_description:
-          "Describe how 'Incident management responsibilities and procedures' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Hold post-incident reviews, record lessons, and convert them into tracked improvement actions. Periodically analyze trends across incidents to identify systemic weaknesses.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1084,29 +955,21 @@ export const ISO27001Annex = [
       },
       {
         index: 28,
-        title: "Reporting information security events",
+        title: "Collection of evidence",
         requirement_summary:
-          "Implement clear and effective measures for 'Reporting information security events' as part of organizational controls to keep information secure.",
+          "Establish and implement procedures for the identification, collection, acquisition, and preservation of information that can serve as evidence.",
         key_questions: [
-          "Do we have a written, approved process for 'Reporting information security events'?",
-          "Who is responsible for ensuring 'Reporting information security events' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Do we have procedures to preserve chain of custody for digital evidence?",
+          "Are forensic tools and training available to responders?",
+          "Have we engaged legal or external forensic support where required?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Digital evidence handling procedure",
+          "Chain-of-custody templates",
+          "Forensic tool and training records",
         ],
         implementation_description:
-          "Describe how 'Reporting information security events' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Define evidence-handling procedures covering identification, acquisition, preservation, and chain of custody. Maintain tooling and training, and coordinate with legal counsel when applicable.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1124,29 +987,20 @@ export const ISO27001Annex = [
       },
       {
         index: 29,
-        title: "Reporting information security weaknesses",
-        requirement_summary:
-          "Implement clear and effective measures for 'Reporting information security weaknesses' as part of organizational controls to keep information secure.",
+        title: "Information security during disruption",
+        requirement_summary: "Plan how to maintain information security at an appropriate level during disruption.",
         key_questions: [
-          "Do we have a written, approved process for 'Reporting information security weaknesses'?",
-          "Who is responsible for ensuring 'Reporting information security weaknesses' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Do continuity plans address how information security controls remain effective during disruption?",
+          "Are alternate sites and workflows assessed for security equivalence?",
+          "Are continuity plans exercised to validate security assumptions?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Business continuity plans with security sections",
+          "Alternate-site security assessments",
+          "Continuity exercise reports",
         ],
         implementation_description:
-          "Describe how 'Reporting information security weaknesses' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Integrate information security requirements into continuity plans, assess alternate workflows and sites, and validate the approach through exercises.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1164,29 +1018,21 @@ export const ISO27001Annex = [
       },
       {
         index: 30,
-        title: "Assessment and decision on information security events",
+        title: "ICT readiness for business continuity",
         requirement_summary:
-          "Implement clear and effective measures for 'Assessment and decision on information security events' as part of organizational controls to keep information secure.",
+          "Plan, implement, maintain, and test ICT readiness based on business continuity objectives and ICT continuity requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Assessment and decision on information security events'?",
-          "Who is responsible for ensuring 'Assessment and decision on information security events' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Have ICT continuity requirements (RTO, RPO) been defined per service?",
+          "Are backup, recovery, and redundancy capabilities tested on a schedule?",
+          "Are ICT continuity plans aligned with the broader business continuity plan?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "ICT continuity requirements (RTO/RPO)",
+          "Backup and recovery test reports",
+          "ICT continuity plan",
         ],
         implementation_description:
-          "Describe how 'Assessment and decision on information security events' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Define per-service ICT continuity requirements, implement backup/recovery/redundancy capabilities, and test them on a defined schedule aligned with the business continuity plan.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1204,29 +1050,21 @@ export const ISO27001Annex = [
       },
       {
         index: 31,
-        title: "Response to information security incidents",
+        title: "Legal, statutory, regulatory and contractual requirements",
         requirement_summary:
-          "Implement clear and effective measures for 'Response to information security incidents' as part of organizational controls to keep information secure.",
+          "Identify, document, and keep up to date the organization's legal, statutory, regulatory, and contractual requirements and how to meet them.",
         key_questions: [
-          "Do we have a written, approved process for 'Response to information security incidents'?",
-          "Who is responsible for ensuring 'Response to information security incidents' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is there a register of applicable legal and contractual requirements?",
+          "Are responsibilities assigned for monitoring changes in each requirement area?",
+          "Are compliance obligations reviewed periodically?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Legal and contractual requirements register",
+          "Compliance assessment reports",
+          "Change notifications from legal/compliance teams",
         ],
         implementation_description:
-          "Describe how 'Response to information security incidents' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Maintain a register of applicable requirements with owners, monitor for changes, and review compliance periodically. Track gaps to closure.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1244,29 +1082,20 @@ export const ISO27001Annex = [
       },
       {
         index: 32,
-        title: "Learning from information security incidents",
-        requirement_summary:
-          "Implement clear and effective measures for 'Learning from information security incidents' as part of organizational controls to keep information secure.",
+        title: "Intellectual property rights",
+        requirement_summary: "Implement appropriate procedures to protect intellectual property rights.",
         key_questions: [
-          "Do we have a written, approved process for 'Learning from information security incidents'?",
-          "Who is responsible for ensuring 'Learning from information security incidents' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are IP rights identified and catalogued for owned and licensed assets?",
+          "Are software licenses and usage tracked for compliance?",
+          "Are employees trained on IP obligations?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Software license inventory",
+          "IP policy and awareness materials",
+          "License compliance audits",
         ],
         implementation_description:
-          "Describe how 'Learning from information security incidents' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Catalogue owned and licensed IP, track software licenses for compliance, and train personnel on IP handling obligations. Perform periodic license compliance checks.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1284,29 +1113,21 @@ export const ISO27001Annex = [
       },
       {
         index: 33,
-        title: "Collection of evidence",
+        title: "Protection of records",
         requirement_summary:
-          "Implement clear and effective measures for 'Collection of evidence' as part of organizational controls to keep information secure.",
+          "Protect records from loss, destruction, falsification, unauthorized access, and unauthorized release, in line with legal, regulatory, contractual, and business requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Collection of evidence'?",
-          "Who is responsible for ensuring 'Collection of evidence' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are record retention periods defined by record class?",
+          "Are records stored and transmitted with controls appropriate to classification?",
+          "Are records destroyed securely when retention expires?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Records retention schedule",
+          "Secure storage and disposal procedures",
+          "Destruction/archival logs",
         ],
         implementation_description:
-          "Describe how 'Collection of evidence' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Define retention periods by record class, apply classification-appropriate storage and transmission controls, and securely destroy records when retention expires.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1324,29 +1145,21 @@ export const ISO27001Annex = [
       },
       {
         index: 34,
-        title: "Business continuity planning for information security",
+        title: "Privacy and protection of personal information",
         requirement_summary:
-          "Implement clear and effective measures for 'Business continuity planning for information security' as part of organizational controls to keep information secure.",
+          "Ensure privacy and protection of personal information as required by applicable legislation, regulations, and contractual requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Business continuity planning for information security'?",
-          "Who is responsible for ensuring 'Business continuity planning for information security' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Have we mapped personal-data processing activities and their legal bases?",
+          "Are data subject rights handled within required timelines?",
+          "Are privacy assessments conducted for high-risk processing?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Records of processing activities (RoPA)",
+          "Data subject request logs",
+          "DPIAs for high-risk processing",
         ],
         implementation_description:
-          "Describe how 'Business continuity planning for information security' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Maintain a record of processing activities, operate data subject request workflows within legal timelines, and run DPIAs on high-risk processing before it begins.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1364,29 +1177,21 @@ export const ISO27001Annex = [
       },
       {
         index: 35,
-        title: "Redundancy of information processing facilities",
+        title: "Independent review of information security",
         requirement_summary:
-          "Implement clear and effective measures for 'Redundancy of information processing facilities' as part of organizational controls to keep information secure.",
+          "Review the organization's approach to managing information security and its implementation at planned intervals or when significant changes occur.",
         key_questions: [
-          "Do we have a written, approved process for 'Redundancy of information processing facilities'?",
-          "Who is responsible for ensuring 'Redundancy of information processing facilities' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are independent reviews of the ISMS planned on a defined cadence?",
+          "Do reviews cover both approach and implementation effectiveness?",
+          "Are review findings tracked to closure?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Independent review plan and schedule",
+          "Review reports with findings",
+          "Remediation tracker tied to review findings",
         ],
         implementation_description:
-          "Describe how 'Redundancy of information processing facilities' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Plan independent reviews (internal audit, external assessor) at defined intervals and on major change. Track findings through a remediation process.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1404,29 +1209,21 @@ export const ISO27001Annex = [
       },
       {
         index: 36,
-        title: "Documented operating procedures",
+        title: "Compliance with policies, rules and standards",
         requirement_summary:
-          "Implement clear and effective measures for 'Documented operating procedures' as part of organizational controls to keep information secure.",
+          "Ensure compliance with the organization's information security policy, topic-specific policies, rules, and standards through regular reviews by management.",
         key_questions: [
-          "Do we have a written, approved process for 'Documented operating procedures'?",
-          "Who is responsible for ensuring 'Documented operating procedures' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "How do we verify that operational activities comply with policies and standards?",
+          "Who conducts and documents compliance reviews?",
+          "How are nonconformities tracked and resolved?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Compliance review reports",
+          "Management review meeting minutes",
+          "Nonconformity and corrective action records",
         ],
         implementation_description:
-          "Describe how 'Documented operating procedures' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Conduct regular management-led reviews of compliance with information security policies, rules, and standards. Record findings and drive nonconformities to closure.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1442,6 +1239,30 @@ export const ISO27001Annex = [
           },
         ],
       },
+      {
+        index: 37,
+        title: "Documented operating procedures",
+        requirement_summary:
+          "Document operating procedures for information processing facilities and make them available to personnel who need them.",
+        key_questions: [
+          "Are operating procedures documented for all relevant information processing facilities?",
+          "Do personnel who need them have access?",
+          "Are procedures reviewed when operational changes occur?",
+        ],
+        evidence_examples: [
+          "Documented operating procedures",
+          "Procedure availability/access records",
+          "Procedure review and update logs",
+        ],
+        implementation_description:
+          "Document operating procedures for information processing facilities (start-up/shut-down, backup, maintenance, media handling, safety). Make them accessible and review on change.",
+        status: "Not Started",
+        owner: "",
+        reviewer: "",
+        approver: "",
+        due_date: "",
+        cross_mappings: [],
+      },
     ],
   },
   {
@@ -1611,29 +1432,21 @@ export const ISO27001Annex = [
       },
       {
         index: 5,
-        title: "Confidentiality or non-disclosure agreements",
+        title: "Responsibilities after termination or change of employment",
         requirement_summary:
-          "Implement clear and effective measures for 'Confidentiality or non-disclosure agreements' as part of people controls to keep information secure.",
+          "Define, enforce, and communicate information security responsibilities and duties that remain valid after termination or change of employment.",
         key_questions: [
-          "Do we have a written, approved process for 'Confidentiality or non-disclosure agreements'?",
-          "Who is responsible for ensuring 'Confidentiality or non-disclosure agreements' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are ongoing security obligations defined in employment contracts?",
+          "Are departing personnel briefed on post-employment obligations?",
+          "Are access rights and assets recovered at termination?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Employment contracts with post-termination clauses",
+          "Exit checklists",
+          "Asset and access recovery records",
         ],
         implementation_description:
-          "Describe how 'Confidentiality or non-disclosure agreements' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Include post-termination obligations in contracts, brief departing personnel, and recover access rights and assets as part of exit workflows.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1651,29 +1464,21 @@ export const ISO27001Annex = [
       },
       {
         index: 6,
-        title: "Remote working",
+        title: "Confidentiality or non-disclosure agreements",
         requirement_summary:
-          "Implement clear and effective measures for 'Remote working' as part of people controls to keep information secure.",
+          "Identify, document, and regularly review requirements for confidentiality or non-disclosure agreements reflecting the organization's needs for information protection.",
         key_questions: [
-          "Do we have a written, approved process for 'Remote working'?",
-          "Who is responsible for ensuring 'Remote working' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Do all personnel and third parties with access to sensitive information sign NDAs?",
+          "Are NDA terms reviewed periodically against evolving risks?",
+          "Are NDA records tracked for expiry and renewal?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "NDA templates",
+          "Signed NDA register",
+          "NDA review schedule",
         ],
         implementation_description:
-          "Describe how 'Remote working' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Use appropriate NDA templates with personnel, contractors, and third parties. Track signatures and expirations, and review template clauses periodically.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1691,29 +1496,21 @@ export const ISO27001Annex = [
       },
       {
         index: 7,
-        title: "Termination or change of employment responsibilities",
+        title: "Remote working",
         requirement_summary:
-          "Implement clear and effective measures for 'Termination or change of employment responsibilities' as part of people controls to keep information secure.",
+          "Implement security measures when personnel work remotely to protect information accessed, processed, or stored outside the organization's premises.",
         key_questions: [
-          "Do we have a written, approved process for 'Termination or change of employment responsibilities'?",
-          "Who is responsible for ensuring 'Termination or change of employment responsibilities' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is there a remote working policy with security requirements?",
+          "Are endpoints managed and protected (encryption, EDR, patching)?",
+          "Are secure connectivity options (VPN, zero-trust) provided and required?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Remote working policy",
+          "Endpoint management/EDR coverage reports",
+          "VPN / zero-trust access logs",
         ],
         implementation_description:
-          "Describe how 'Termination or change of employment responsibilities' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Publish a remote working policy, provide managed endpoints with encryption and EDR, and require secure connectivity with strong authentication.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1731,29 +1528,21 @@ export const ISO27001Annex = [
       },
       {
         index: 8,
-        title: "User responsibilities",
+        title: "Information security event reporting",
         requirement_summary:
-          "Implement clear and effective measures for 'User responsibilities' as part of people controls to keep information secure.",
+          "Provide a mechanism for personnel to report observed or suspected information security events through appropriate channels in a timely manner.",
         key_questions: [
-          "Do we have a written, approved process for 'User responsibilities'?",
-          "Who is responsible for ensuring 'User responsibilities' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are reporting channels clearly communicated to all personnel?",
+          "Are reports acknowledged and triaged promptly?",
+          "Are reporters protected from retaliation?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Event reporting policy and channels",
+          "Reported event logs with triage timestamps",
+          "Awareness materials on how and where to report",
         ],
         implementation_description:
-          "Describe how 'User responsibilities' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Publish clear reporting channels (email, intranet, hotline) and communicate them broadly. Acknowledge and triage reports promptly, and protect reporters from retaliation.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1898,29 +1687,20 @@ export const ISO27001Annex = [
       },
       {
         index: 4,
-        title: "Protecting against physical and environmental threats",
-        requirement_summary:
-          "Implement clear and effective measures for 'Protecting against physical and environmental threats' as part of physical controls to keep information secure.",
+        title: "Physical security monitoring",
+        requirement_summary: "Continuously monitor premises for unauthorized physical access.",
         key_questions: [
-          "Do we have a written, approved process for 'Protecting against physical and environmental threats'?",
-          "Who is responsible for ensuring 'Protecting against physical and environmental threats' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are sensitive premises monitored (CCTV, intrusion detection, guards)?",
+          "Are monitoring logs reviewed and alerts actioned?",
+          "Is monitoring coverage proportionate to asset value and risk?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "CCTV and intrusion detection coverage maps",
+          "Monitoring event logs and alert response records",
+          "Physical security risk assessment",
         ],
         implementation_description:
-          "Describe how 'Protecting against physical and environmental threats' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Implement physical monitoring (CCTV, intrusion detection, guards) proportionate to risk. Review logs and action alerts through a defined process.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1938,29 +1718,21 @@ export const ISO27001Annex = [
       },
       {
         index: 5,
-        title: "Working in secure areas",
+        title: "Protecting against physical and environmental threats",
         requirement_summary:
-          "Implement clear and effective measures for 'Working in secure areas' as part of physical controls to keep information secure.",
+          "Design and implement protection against natural disasters, malicious or accidental physical attacks, and environmental threats.",
         key_questions: [
-          "Do we have a written, approved process for 'Working in secure areas'?",
-          "Who is responsible for ensuring 'Working in secure areas' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Have we assessed natural, accidental, and deliberate physical threats?",
+          "Are protective measures (fire, flood, power, intrusion) in place for each critical facility?",
+          "Are protective measures tested and maintained?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Physical and environmental threat assessment",
+          "Protective system maintenance records",
+          "Test results for fire, power, and flood defenses",
         ],
         implementation_description:
-          "Describe how 'Working in secure areas' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Assess physical and environmental threats to each facility, implement protective measures (fire suppression, flood/power protection, intrusion hardening), and maintain and test them on a schedule.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -1978,29 +1750,20 @@ export const ISO27001Annex = [
       },
       {
         index: 6,
-        title: "Visitor access records",
-        requirement_summary:
-          "Implement clear and effective measures for 'Visitor access records' as part of physical controls to keep information secure.",
+        title: "Working in secure areas",
+        requirement_summary: "Design and implement security procedures for working in secure areas.",
         key_questions: [
-          "Do we have a written, approved process for 'Visitor access records'?",
-          "Who is responsible for ensuring 'Visitor access records' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are secure areas defined and access controls documented?",
+          "Are rules for work inside secure areas (devices, recording, visitors) established?",
+          "Are secure areas reviewed for compliance?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Secure area definitions and access control records",
+          "Secure area work rules",
+          "Compliance spot-check records",
         ],
         implementation_description:
-          "Describe how 'Visitor access records' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Define secure areas, document entry/exit and behavior rules, and audit for compliance. Ensure rules cover device use, recording, and escorting visitors.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2018,29 +1781,21 @@ export const ISO27001Annex = [
       },
       {
         index: 7,
-        title: "Delivery and loading areas",
+        title: "Clear desk and clear screen",
         requirement_summary:
-          "Implement clear and effective measures for 'Delivery and loading areas' as part of physical controls to keep information secure.",
+          "Establish clear desk rules for papers and removable storage media and clear screen rules for information processing facilities.",
         key_questions: [
-          "Do we have a written, approved process for 'Delivery and loading areas'?",
-          "Who is responsible for ensuring 'Delivery and loading areas' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is a clear desk and clear screen policy in place?",
+          "Are screens locked automatically after inactivity?",
+          "Is compliance checked during physical walkthroughs?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Clear desk and clear screen policy",
+          "Screen auto-lock configuration",
+          "Walkthrough compliance records",
         ],
         implementation_description:
-          "Describe how 'Delivery and loading areas' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Publish clear desk and clear screen rules, enforce auto-lock on devices, and perform walkthrough checks to identify and correct non-compliance.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2098,29 +1853,21 @@ export const ISO27001Annex = [
       },
       {
         index: 9,
-        title: "Supporting utilities",
+        title: "Security of assets off-premises",
         requirement_summary:
-          "Implement clear and effective measures for 'Supporting utilities' as part of physical controls to keep information secure.",
+          "Apply security to off-site assets, considering the different risks of working outside the organization's premises.",
         key_questions: [
-          "Do we have a written, approved process for 'Supporting utilities'?",
-          "Who is responsible for ensuring 'Supporting utilities' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are assets taken off-site authorized and tracked?",
+          "Are protection measures (encryption, physical security) applied?",
+          "Are loss or theft procedures defined?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Off-site asset register",
+          "Encryption and device protection records",
+          "Loss/theft response procedure",
         ],
         implementation_description:
-          "Describe how 'Supporting utilities' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Authorize and track off-site asset use, require encryption and physical security, and define procedures for loss or theft including prompt reporting.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2138,29 +1885,21 @@ export const ISO27001Annex = [
       },
       {
         index: 10,
-        title: "Cabling security",
+        title: "Storage media",
         requirement_summary:
-          "Implement clear and effective measures for 'Cabling security' as part of physical controls to keep information secure.",
+          "Manage storage media through their lifecycle of acquisition, use, transportation, and disposal in accordance with the classification scheme and handling requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Cabling security'?",
-          "Who is responsible for ensuring 'Cabling security' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are procedures defined for each media lifecycle stage?",
+          "Is media handled according to its classification level?",
+          "Is secure disposal verified and recorded?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Media handling procedure",
+          "Media disposal records (shredding/wiping certificates)",
+          "Transport-in-transit records for sensitive media",
         ],
         implementation_description:
-          "Describe how 'Cabling security' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Manage storage media across acquisition, use, transport, and disposal with classification-appropriate controls. Record and verify disposal using certified processes.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2178,29 +1917,21 @@ export const ISO27001Annex = [
       },
       {
         index: 11,
-        title: "Equipment maintenance",
+        title: "Supporting utilities",
         requirement_summary:
-          "Implement clear and effective measures for 'Equipment maintenance' as part of physical controls to keep information secure.",
+          "Protect information processing facilities from power failures and other disruptions caused by failures in supporting utilities.",
         key_questions: [
-          "Do we have a written, approved process for 'Equipment maintenance'?",
-          "Who is responsible for ensuring 'Equipment maintenance' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are power, cooling, and communications utilities resilient (UPS, generators, redundancy)?",
+          "Are utilities tested on a schedule?",
+          "Are suppliers' SLAs appropriate to risk?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "UPS/generator configuration and test logs",
+          "Cooling and HVAC maintenance records",
+          "Utility supplier SLAs",
         ],
         implementation_description:
-          "Describe how 'Equipment maintenance' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Provision resilient power, cooling, and communications with UPS/generator coverage. Test supporting utilities regularly and align supplier SLAs to criticality.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2218,29 +1949,21 @@ export const ISO27001Annex = [
       },
       {
         index: 12,
-        title: "Secure disposal or re-use of equipment",
+        title: "Cabling security",
         requirement_summary:
-          "Implement clear and effective measures for 'Secure disposal or re-use of equipment' as part of physical controls to keep information secure.",
+          "Protect power and telecommunications cabling carrying data or supporting information services from interception, interference, or damage.",
         key_questions: [
-          "Do we have a written, approved process for 'Secure disposal or re-use of equipment'?",
-          "Who is responsible for ensuring 'Secure disposal or re-use of equipment' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are cable runs physically protected and segregated where needed?",
+          "Are patch panels and cable terminations secured?",
+          "Are cable diagrams maintained and controlled?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Cable infrastructure diagrams",
+          "Physical cable protection implementation photos/logs",
+          "Patch panel access logs",
         ],
         implementation_description:
-          "Describe how 'Secure disposal or re-use of equipment' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Route and protect cabling to reduce interception and damage risk. Secure terminations and patch panels and maintain up-to-date cable documentation.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2258,29 +1981,21 @@ export const ISO27001Annex = [
       },
       {
         index: 13,
-        title: "Removal of assets",
+        title: "Equipment maintenance",
         requirement_summary:
-          "Implement clear and effective measures for 'Removal of assets' as part of physical controls to keep information secure.",
+          "Maintain equipment correctly to ensure the availability, integrity, and continued confidentiality of information.",
         key_questions: [
-          "Do we have a written, approved process for 'Removal of assets'?",
-          "Who is responsible for ensuring 'Removal of assets' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is equipment maintained in line with vendor guidance?",
+          "Are maintenance activities logged?",
+          "Is data protected during off-site maintenance?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Maintenance schedule and logs",
+          "Vendor service records",
+          "Data protection procedures for serviced equipment",
         ],
         implementation_description:
-          "Describe how 'Removal of assets' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Follow vendor maintenance schedules, log maintenance activities, and protect data on equipment that leaves the premises for service (wipe or remove media where appropriate).",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2298,29 +2013,21 @@ export const ISO27001Annex = [
       },
       {
         index: 14,
-        title: "Clear desk and clear screen policy",
+        title: "Secure disposal or re-use of equipment",
         requirement_summary:
-          "Implement clear and effective measures for 'Clear desk and clear screen policy' as part of physical controls to keep information secure.",
+          "Verify that items of equipment containing storage media are securely overwritten or destroyed before disposal or re-use.",
         key_questions: [
-          "Do we have a written, approved process for 'Clear desk and clear screen policy'?",
-          "Who is responsible for ensuring 'Clear desk and clear screen policy' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are disposal procedures defined and followed for all equipment types?",
+          "Is destruction/wiping verified and recorded?",
+          "Are certificates of destruction retained where required?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Equipment disposal procedure",
+          "Wipe/destruction verification records",
+          "Certificates of destruction",
         ],
         implementation_description:
-          "Describe how 'Clear desk and clear screen policy' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Follow a documented disposal process that verifies secure wipe or physical destruction of media. Retain destruction records and certificates where contractually or legally required.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2423,29 +2130,21 @@ export const ISO27001Annex = [
       },
       {
         index: 3,
-        title: "Access to source code",
+        title: "Information access restriction",
         requirement_summary:
-          "Implement clear and effective measures for 'Access to source code' as part of technological controls to keep information secure.",
+          "Restrict access to information and other associated assets in line with the access control topic-specific policy.",
         key_questions: [
-          "Do we have a written, approved process for 'Access to source code'?",
-          "Who is responsible for ensuring 'Access to source code' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are access restrictions applied at application and data-store levels?",
+          "Are role definitions reviewed against actual usage?",
+          "Is access denied by default and granted explicitly?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Role-based access control configuration",
+          "Access review outcomes",
+          "Default-deny policy evidence",
         ],
         implementation_description:
-          "Describe how 'Access to source code' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Apply least-privilege access at application and data layers, review roles against actual usage, and deny access by default.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2462,29 +2161,21 @@ export const ISO27001Annex = [
       },
       {
         index: 4,
-        title: "Change management",
+        title: "Access to source code",
         requirement_summary:
-          "Implement clear and effective measures for 'Change management' as part of technological controls to keep information secure.",
+          "Restrict read and write access to source code, development tools, and software libraries to authorized personnel.",
         key_questions: [
-          "Do we have a written, approved process for 'Change management'?",
-          "Who is responsible for ensuring 'Change management' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is source code repository access restricted and logged?",
+          "Are branch protections and code review requirements in force?",
+          "Are developer access rights reviewed periodically?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Repository access controls",
+          "Branch protection rules",
+          "Developer access review records",
         ],
         implementation_description:
-          "Describe how 'Change management' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Restrict source code access via repository permissions, require code review for changes to protected branches, and review developer access rights periodically.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2501,29 +2192,21 @@ export const ISO27001Annex = [
       },
       {
         index: 5,
-        title: "Capacity management",
+        title: "Secure authentication",
         requirement_summary:
-          "Implement clear and effective measures for 'Capacity management' as part of technological controls to keep information secure.",
+          "Implement secure authentication technologies and procedures based on information access restrictions and the access control topic-specific policy.",
         key_questions: [
-          "Do we have a written, approved process for 'Capacity management'?",
-          "Who is responsible for ensuring 'Capacity management' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is MFA required for sensitive access?",
+          "Are weak or default authentication mechanisms eliminated?",
+          "Are authentication events monitored for anomalies?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "MFA enforcement policy and coverage",
+          "Authentication configuration standards",
+          "Authentication anomaly alerts",
         ],
         implementation_description:
-          "Describe how 'Capacity management' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Enforce strong authentication (MFA, phishing-resistant where appropriate), eliminate weak defaults, and monitor authentication events for anomalies.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2540,29 +2223,20 @@ export const ISO27001Annex = [
       },
       {
         index: 6,
-        title: "Development, testing and operational environments",
-        requirement_summary:
-          "Implement clear and effective measures for 'Development, testing and operational environments' as part of technological controls to keep information secure.",
+        title: "Capacity management",
+        requirement_summary: "Monitor and adjust the use of resources in line with current and expected capacity requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Development, testing and operational environments'?",
-          "Who is responsible for ensuring 'Development, testing and operational environments' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are capacity metrics monitored for critical systems?",
+          "Are forecasts maintained and reviewed?",
+          "Are scaling actions triggered before saturation?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Capacity dashboards",
+          "Capacity forecast documents",
+          "Scaling/provisioning action logs",
         ],
         implementation_description:
-          "Describe how 'Development, testing and operational environments' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Monitor capacity of critical systems, maintain forecasts, and trigger scaling actions ahead of saturation thresholds.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2579,29 +2253,21 @@ export const ISO27001Annex = [
       },
       {
         index: 7,
-        title: "Protection of test data",
+        title: "Protection against malware",
         requirement_summary:
-          "Implement clear and effective measures for 'Protection of test data' as part of technological controls to keep information secure.",
+          "Implement detection, prevention, and recovery controls combined with user awareness to protect against malware.",
         key_questions: [
-          "Do we have a written, approved process for 'Protection of test data'?",
-          "Who is responsible for ensuring 'Protection of test data' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is endpoint protection (EDR/AV) deployed across all endpoints?",
+          "Are detections investigated and contained promptly?",
+          "Do users receive awareness training on malware risks?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Endpoint protection coverage report",
+          "Malware detection and response logs",
+          "User awareness training records",
         ],
         implementation_description:
-          "Describe how 'Protection of test data' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Deploy and maintain endpoint protection across all endpoints, investigate detections promptly, and reinforce with user awareness training.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2618,29 +2284,21 @@ export const ISO27001Annex = [
       },
       {
         index: 8,
-        title: "Logging and monitoring",
+        title: "Management of technical vulnerabilities",
         requirement_summary:
-          "Implement clear and effective measures for 'Logging and monitoring' as part of technological controls to keep information secure.",
+          "Obtain timely information about technical vulnerabilities, evaluate the organization's exposure, and take appropriate measures to address the associated risks.",
         key_questions: [
-          "Do we have a written, approved process for 'Logging and monitoring'?",
-          "Who is responsible for ensuring 'Logging and monitoring' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are vulnerability feeds and scanners in use?",
+          "Are vulnerabilities prioritized by risk and remediated within SLA?",
+          "Are exceptions tracked and periodically reviewed?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Vulnerability scan reports",
+          "Remediation tracker with SLA metrics",
+          "Exception register",
         ],
         implementation_description:
-          "Describe how 'Logging and monitoring' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Subscribe to vulnerability feeds, scan environments regularly, prioritize by risk, remediate within SLA, and track exceptions with expiry.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2657,29 +2315,21 @@ export const ISO27001Annex = [
       },
       {
         index: 9,
-        title: "Clock synchronization",
+        title: "Configuration management",
         requirement_summary:
-          "Implement clear and effective measures for 'Clock synchronization' as part of technological controls to keep information secure.",
+          "Establish, document, implement, monitor, and review configurations, including security configurations, of hardware, software, services, and networks.",
         key_questions: [
-          "Do we have a written, approved process for 'Clock synchronization'?",
-          "Who is responsible for ensuring 'Clock synchronization' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are hardened configuration baselines defined per platform?",
+          "Is drift detected and remediated?",
+          "Are configuration changes controlled via change management?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Hardening baselines (CIS, vendor benchmarks)",
+          "Configuration drift reports",
+          "Change approval records for configuration changes",
         ],
         implementation_description:
-          "Describe how 'Clock synchronization' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Define hardening baselines, apply them via automation, detect and remediate drift, and gate configuration changes through change management.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2696,29 +2346,21 @@ export const ISO27001Annex = [
       },
       {
         index: 10,
-        title: "Protection of log information",
+        title: "Information deletion",
         requirement_summary:
-          "Implement clear and effective measures for 'Protection of log information' as part of technological controls to keep information secure.",
+          "Delete information stored in information systems, devices, or any other storage media when no longer required.",
         key_questions: [
-          "Do we have a written, approved process for 'Protection of log information'?",
-          "Who is responsible for ensuring 'Protection of log information' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are deletion triggers tied to retention schedules?",
+          "Is deletion verified, including in backups where required?",
+          "Are third parties required to delete data on termination?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Data retention and deletion schedule",
+          "Deletion verification records",
+          "Third-party deletion attestations",
         ],
         implementation_description:
-          "Describe how 'Protection of log information' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Tie deletion to retention schedules, verify deletion (including backups where required), and obtain attestations from third parties at contract termination.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2735,29 +2377,21 @@ export const ISO27001Annex = [
       },
       {
         index: 11,
-        title: "Administrator and operator logs",
+        title: "Data masking",
         requirement_summary:
-          "Implement clear and effective measures for 'Administrator and operator logs' as part of technological controls to keep information secure.",
+          "Use data masking, pseudonymization, or anonymization in accordance with the organization's access control policy and applicable legislation.",
         key_questions: [
-          "Do we have a written, approved process for 'Administrator and operator logs'?",
-          "Who is responsible for ensuring 'Administrator and operator logs' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is production data masked when used in non-production environments?",
+          "Are pseudonymization and anonymization techniques applied where appropriate?",
+          "Is re-identification risk assessed?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Data masking policy",
+          "Masking tool configuration",
+          "Re-identification risk assessments",
         ],
         implementation_description:
-          "Describe how 'Administrator and operator logs' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Mask, pseudonymize, or anonymize data based on its classification and use context. Assess re-identification risk for pseudonymized datasets.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2774,29 +2408,21 @@ export const ISO27001Annex = [
       },
       {
         index: 12,
-        title: "Fault logging",
+        title: "Data leakage prevention",
         requirement_summary:
-          "Implement clear and effective measures for 'Fault logging' as part of technological controls to keep information secure.",
+          "Apply data leakage prevention measures to systems, networks, and any other devices that process, store, or transmit sensitive information.",
         key_questions: [
-          "Do we have a written, approved process for 'Fault logging'?",
-          "Who is responsible for ensuring 'Fault logging' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is DLP deployed on email, endpoints, and cloud services carrying sensitive data?",
+          "Are DLP policies tuned to minimize false positives?",
+          "Are DLP incidents triaged and actioned?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "DLP policy and configuration",
+          "DLP incident logs and response records",
+          "DLP tuning and metrics reports",
         ],
         implementation_description:
-          "Describe how 'Fault logging' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Deploy DLP on primary data flows (email, endpoints, cloud), tune policies, and triage incidents through a defined response process.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2813,29 +2439,21 @@ export const ISO27001Annex = [
       },
       {
         index: 13,
-        title: "Cryptographic controls policy",
+        title: "Information backup",
         requirement_summary:
-          "Implement clear and effective measures for 'Cryptographic controls policy' as part of technological controls to keep information secure.",
+          "Maintain backup copies of information, software, and systems and regularly test them in accordance with the agreed topic-specific policy on backup.",
         key_questions: [
-          "Do we have a written, approved process for 'Cryptographic controls policy'?",
-          "Who is responsible for ensuring 'Cryptographic controls policy' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are backups taken per defined RPO for critical systems?",
+          "Are restore tests performed on a schedule?",
+          "Are backups protected from unauthorized access and ransomware?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Backup policy and schedule",
+          "Backup job logs",
+          "Restore test reports",
         ],
         implementation_description:
-          "Describe how 'Cryptographic controls policy' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Run backups per defined RPO, test restoration on a schedule, and protect backup media from unauthorized access (immutable or offline copies).",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2852,29 +2470,21 @@ export const ISO27001Annex = [
       },
       {
         index: 14,
-        title: "Key management",
+        title: "Redundancy of information processing facilities",
         requirement_summary:
-          "Implement clear and effective measures for 'Key management' as part of technological controls to keep information secure.",
+          "Implement information processing facilities with redundancy sufficient to meet availability requirements.",
         key_questions: [
-          "Do we have a written, approved process for 'Key management'?",
-          "Who is responsible for ensuring 'Key management' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are critical services designed with redundancy that meets availability targets?",
+          "Is failover tested on a schedule?",
+          "Are single points of failure identified and remediated?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Architecture diagrams showing redundancy",
+          "Failover test reports",
+          "SPOF register",
         ],
         implementation_description:
-          "Describe how 'Key management' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Design redundancy into critical services to meet availability targets, test failover, and track single points of failure for remediation.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2891,29 +2501,21 @@ export const ISO27001Annex = [
       },
       {
         index: 15,
-        title: "Network controls",
+        title: "Logging",
         requirement_summary:
-          "Implement clear and effective measures for 'Network controls' as part of technological controls to keep information secure.",
+          "Produce, store, protect, and analyze logs that record activities, exceptions, faults, and other relevant events.",
         key_questions: [
-          "Do we have a written, approved process for 'Network controls'?",
-          "Who is responsible for ensuring 'Network controls' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are security-relevant events logged across systems?",
+          "Are logs protected against tampering?",
+          "Are logs centralized and retained per policy?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Logging standard and coverage matrix",
+          "SIEM/log aggregation configuration",
+          "Log retention and integrity records",
         ],
         implementation_description:
-          "Describe how 'Network controls' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Define logging standards, centralize logs in a protected repository, retain per policy, and protect against tampering (append-only, hash integrity).",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2930,29 +2532,21 @@ export const ISO27001Annex = [
       },
       {
         index: 16,
-        title: "Security of network services",
+        title: "Monitoring activities",
         requirement_summary:
-          "Implement clear and effective measures for 'Security of network services' as part of technological controls to keep information secure.",
+          "Monitor networks, systems, and applications for anomalous behavior and take appropriate action to evaluate potential security incidents.",
         key_questions: [
-          "Do we have a written, approved process for 'Security of network services'?",
-          "Who is responsible for ensuring 'Security of network services' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are detection rules and use cases aligned with threat models?",
+          "Are alerts triaged within defined SLAs?",
+          "Is monitoring coverage reviewed and expanded over time?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Detection use-case catalog",
+          "Alert triage SLA metrics",
+          "Coverage gap analyses",
         ],
         implementation_description:
-          "Describe how 'Security of network services' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Build detection use cases aligned with threats, triage alerts within SLA, and periodically review and expand monitoring coverage.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -2969,29 +2563,20 @@ export const ISO27001Annex = [
       },
       {
         index: 17,
-        title: "Segregation of networks",
-        requirement_summary:
-          "Implement clear and effective measures for 'Segregation of networks' as part of technological controls to keep information secure.",
+        title: "Clock synchronization",
+        requirement_summary: "Synchronize clocks of the organization's information processing systems to approved time sources.",
         key_questions: [
-          "Do we have a written, approved process for 'Segregation of networks'?",
-          "Who is responsible for ensuring 'Segregation of networks' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are all systems synchronized to a common, authoritative time source?",
+          "Is clock drift monitored and alerted?",
+          "Are time-stamped log sources reliable for forensic use?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "NTP configuration standard",
+          "Clock drift monitoring reports",
+          "Forensic timeline examples citing synchronized logs",
         ],
         implementation_description:
-          "Describe how 'Segregation of networks' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Point all systems at approved time sources (NTP/PTP), monitor for drift, and ensure logs carry reliable timestamps for forensic use.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3008,29 +2593,21 @@ export const ISO27001Annex = [
       },
       {
         index: 18,
-        title: "Use of network services",
+        title: "Use of privileged utility programs",
         requirement_summary:
-          "Implement clear and effective measures for 'Use of network services' as part of technological controls to keep information secure.",
+          "Restrict and tightly control the use of utility programs capable of overriding system and application controls.",
         key_questions: [
-          "Do we have a written, approved process for 'Use of network services'?",
-          "Who is responsible for ensuring 'Use of network services' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are privileged utilities identified and inventoried?",
+          "Is their use authorized, logged, and reviewed?",
+          "Are access paths restricted to authorized personnel only?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Privileged utility inventory",
+          "Utility usage logs",
+          "Authorization records for utility use",
         ],
         implementation_description:
-          "Describe how 'Use of network services' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Inventory privileged utilities, require authorization for use, log all usage, and review the logs for anomalies.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3047,29 +2624,20 @@ export const ISO27001Annex = [
       },
       {
         index: 19,
-        title: "Web filtering",
-        requirement_summary:
-          "Implement clear and effective measures for 'Web filtering' as part of technological controls to keep information secure.",
+        title: "Installation of software on operational systems",
+        requirement_summary: "Implement procedures and measures to securely manage software installation on operational systems.",
         key_questions: [
-          "Do we have a written, approved process for 'Web filtering'?",
-          "Who is responsible for ensuring 'Web filtering' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is software installation limited to authorized personnel and approved packages?",
+          "Are installation sources verified (signing, hash)?",
+          "Are changes tracked in change management?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Approved software catalog",
+          "Software installation logs",
+          "Change management records for software deployments",
         ],
         implementation_description:
-          "Describe how 'Web filtering' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Control software installation via an approved catalog, verify package integrity, and gate deployments through change management.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3086,29 +2654,21 @@ export const ISO27001Annex = [
       },
       {
         index: 20,
-        title: "Cryptographic key usage",
+        title: "Networks security",
         requirement_summary:
-          "Implement clear and effective measures for 'Cryptographic key usage' as part of technological controls to keep information secure.",
+          "Secure networks and network devices and manage and control them to protect information in systems and applications.",
         key_questions: [
-          "Do we have a written, approved process for 'Cryptographic key usage'?",
-          "Who is responsible for ensuring 'Cryptographic key usage' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are network devices hardened and managed centrally?",
+          "Are security controls (firewalls, IDS/IPS) deployed and maintained?",
+          "Is network architecture documented and reviewed?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Network architecture diagrams",
+          "Network device hardening standards",
+          "Firewall/IDS configuration and logs",
         ],
         implementation_description:
-          "Describe how 'Cryptographic key usage' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Harden and centrally manage network devices, deploy firewalls and IDS/IPS, and maintain current architecture documentation reviewed on change.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3125,29 +2685,21 @@ export const ISO27001Annex = [
       },
       {
         index: 21,
-        title: "Backup",
+        title: "Security of network services",
         requirement_summary:
-          "Implement clear and effective measures for 'Backup' as part of technological controls to keep information secure.",
+          "Identify, implement, and monitor security mechanisms, service levels, and requirements of all network services.",
         key_questions: [
-          "Do we have a written, approved process for 'Backup'?",
-          "Who is responsible for ensuring 'Backup' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are network services inventoried with their security requirements?",
+          "Are supplier SLAs aligned to security needs?",
+          "Is service performance monitored against requirements?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Network services inventory",
+          "Network service SLAs",
+          "Service monitoring reports",
         ],
         implementation_description:
-          "Describe how 'Backup' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Inventory network services, define security requirements per service, align supplier SLAs, and monitor performance against requirements.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3164,29 +2716,21 @@ export const ISO27001Annex = [
       },
       {
         index: 22,
-        title: "Information transfer policies and procedures",
+        title: "Segregation of networks",
         requirement_summary:
-          "Implement clear and effective measures for 'Information transfer policies and procedures' as part of technological controls to keep information secure.",
+          "Segregate groups of information services, users, and information systems in the organization's networks.",
         key_questions: [
-          "Do we have a written, approved process for 'Information transfer policies and procedures'?",
-          "Who is responsible for ensuring 'Information transfer policies and procedures' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are network segments aligned with trust and classification levels?",
+          "Are east-west flows controlled and minimized?",
+          "Are segmentation boundaries audited and maintained?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Network segmentation design",
+          "Firewall rules between segments",
+          "Segmentation audit reports",
         ],
         implementation_description:
-          "Describe how 'Information transfer policies and procedures' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Segment networks by trust and classification, restrict east-west traffic by default, and audit segmentation boundaries on a schedule.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3203,29 +2747,20 @@ export const ISO27001Annex = [
       },
       {
         index: 23,
-        title: "Electronic messaging",
-        requirement_summary:
-          "Implement clear and effective measures for 'Electronic messaging' as part of technological controls to keep information secure.",
+        title: "Web filtering",
+        requirement_summary: "Manage access to external websites to reduce exposure to malicious content.",
         key_questions: [
-          "Do we have a written, approved process for 'Electronic messaging'?",
-          "Who is responsible for ensuring 'Electronic messaging' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is web access filtered by category and reputation?",
+          "Are bypass mechanisms controlled and logged?",
+          "Are users informed of filtering policy?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Web filtering policy and configuration",
+          "Bypass authorization logs",
+          "User awareness material on web filtering",
         ],
         implementation_description:
-          "Describe how 'Electronic messaging' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Enforce category and reputation-based web filtering, control and log any bypass mechanisms, and communicate policy to users.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3242,29 +2777,21 @@ export const ISO27001Annex = [
       },
       {
         index: 24,
-        title: "Confidentiality of information in networks",
+        title: "Use of cryptography",
         requirement_summary:
-          "Implement clear and effective measures for 'Confidentiality of information in networks' as part of technological controls to keep information secure.",
+          "Define and implement rules for effective use of cryptography, including cryptographic key management.",
         key_questions: [
-          "Do we have a written, approved process for 'Confidentiality of information in networks'?",
-          "Who is responsible for ensuring 'Confidentiality of information in networks' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is there a cryptography policy covering algorithms and key lengths?",
+          "Is key management performed through a defined lifecycle?",
+          "Are cryptographic implementations periodically reviewed?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Cryptography policy",
+          "Key management procedures",
+          "Crypto implementation review reports",
         ],
         implementation_description:
-          "Describe how 'Confidentiality of information in networks' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Publish a cryptography policy, operate a key management lifecycle (generation, distribution, rotation, destruction), and review implementations periodically.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3281,29 +2808,20 @@ export const ISO27001Annex = [
       },
       {
         index: 25,
-        title: "Security of system files",
-        requirement_summary:
-          "Implement clear and effective measures for 'Security of system files' as part of technological controls to keep information secure.",
+        title: "Secure development life cycle",
+        requirement_summary: "Establish and apply rules for the secure development of software and systems.",
         key_questions: [
-          "Do we have a written, approved process for 'Security of system files'?",
-          "Who is responsible for ensuring 'Security of system files' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is a secure SDLC defined and followed?",
+          "Are security activities integrated at each phase (design, build, test, release)?",
+          "Are security issues tracked to closure?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Secure SDLC standard",
+          "Security gate evidence per phase",
+          "Security defect tracker",
         ],
         implementation_description:
-          "Describe how 'Security of system files' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Adopt a secure SDLC with security activities and gates at each phase. Track security defects to closure with priority-based SLAs.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3320,29 +2838,21 @@ export const ISO27001Annex = [
       },
       {
         index: 26,
-        title: "Malware protection",
+        title: "Application security requirements",
         requirement_summary:
-          "Implement clear and effective measures for 'Malware protection' as part of technological controls to keep information secure.",
+          "Identify, specify, and approve information security requirements when developing or acquiring applications.",
         key_questions: [
-          "Do we have a written, approved process for 'Malware protection'?",
-          "Who is responsible for ensuring 'Malware protection' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are security requirements captured in every new/changed application?",
+          "Are requirements reviewed for completeness before development?",
+          "Are security acceptance criteria defined and tested?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Security requirements template",
+          "Requirements sign-off records",
+          "Security acceptance test results",
         ],
         implementation_description:
-          "Describe how 'Malware protection' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Capture security requirements in every application build or acquisition, review for completeness, and verify via security acceptance tests before release.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3359,29 +2869,21 @@ export const ISO27001Annex = [
       },
       {
         index: 27,
-        title: "Technical vulnerability management",
+        title: "Secure system architecture and engineering principles",
         requirement_summary:
-          "Implement clear and effective measures for 'Technical vulnerability management' as part of technological controls to keep information secure.",
+          "Establish, document, maintain, and apply principles for engineering secure systems to any information system development activities.",
         key_questions: [
-          "Do we have a written, approved process for 'Technical vulnerability management'?",
-          "Who is responsible for ensuring 'Technical vulnerability management' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are secure design principles documented and applied?",
+          "Are architectural reviews performed for significant changes?",
+          "Are reusable secure patterns published for development teams?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Secure design principles document",
+          "Architecture review records",
+          "Reusable secure design patterns library",
         ],
         implementation_description:
-          "Describe how 'Technical vulnerability management' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Maintain secure design principles, run architecture reviews on significant changes, and publish reusable patterns to promote consistency.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3398,29 +2900,20 @@ export const ISO27001Annex = [
       },
       {
         index: 28,
-        title: "Configuration management",
-        requirement_summary:
-          "Implement clear and effective measures for 'Configuration management' as part of technological controls to keep information secure.",
+        title: "Secure coding",
+        requirement_summary: "Apply secure coding principles to software development.",
         key_questions: [
-          "Do we have a written, approved process for 'Configuration management'?",
-          "Who is responsible for ensuring 'Configuration management' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are secure coding standards defined per language/framework?",
+          "Is static analysis integrated into the build pipeline?",
+          "Are developers trained on secure coding?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Secure coding standards",
+          "Static analysis reports",
+          "Secure coding training records",
         ],
         implementation_description:
-          "Describe how 'Configuration management' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Adopt secure coding standards per language, integrate static analysis into CI, and train developers on common vulnerability classes.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3437,29 +2930,20 @@ export const ISO27001Annex = [
       },
       {
         index: 29,
-        title: "Monitoring of system use",
-        requirement_summary:
-          "Implement clear and effective measures for 'Monitoring of system use' as part of technological controls to keep information secure.",
+        title: "Security testing in development and acceptance",
+        requirement_summary: "Define and implement security testing processes in the development life cycle.",
         key_questions: [
-          "Do we have a written, approved process for 'Monitoring of system use'?",
-          "Who is responsible for ensuring 'Monitoring of system use' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are SAST, DAST, and dependency scans integrated?",
+          "Are high/critical findings blocked at the appropriate gate?",
+          "Are penetration tests performed before significant releases?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "CI security scan configuration",
+          "Pen test reports",
+          "Release gate records showing security sign-off",
         ],
         implementation_description:
-          "Describe how 'Monitoring of system use' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Integrate SAST, DAST, and dependency scanning; block high/critical findings at release gates; and run penetration tests before significant releases.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3476,29 +2960,20 @@ export const ISO27001Annex = [
       },
       {
         index: 30,
-        title: "Protection of application services",
-        requirement_summary:
-          "Implement clear and effective measures for 'Protection of application services' as part of technological controls to keep information secure.",
+        title: "Outsourced development",
+        requirement_summary: "Direct, monitor, and review activities related to outsourced system development.",
         key_questions: [
-          "Do we have a written, approved process for 'Protection of application services'?",
-          "Who is responsible for ensuring 'Protection of application services' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are security requirements included in outsourced development contracts?",
+          "Do we monitor outsourced development deliverables for security?",
+          "Are vendor developers held to the same secure coding and testing standards?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Outsourced development contracts with security clauses",
+          "Deliverable security review records",
+          "Vendor developer training attestations",
         ],
         implementation_description:
-          "Describe how 'Protection of application services' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Include security requirements in outsourced development contracts, review deliverables for security, and hold vendor developers to equivalent secure development standards.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3515,29 +2990,20 @@ export const ISO27001Annex = [
       },
       {
         index: 31,
-        title: "Data masking",
-        requirement_summary:
-          "Implement clear and effective measures for 'Data masking' as part of technological controls to keep information secure.",
+        title: "Separation of development, test and production environments",
+        requirement_summary: "Separate and secure development, testing, and production environments.",
         key_questions: [
-          "Do we have a written, approved process for 'Data masking'?",
-          "Who is responsible for ensuring 'Data masking' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are dev, test, and prod environments logically and access-separated?",
+          "Is production data prevented from flowing into lower environments without masking?",
+          "Are promotions between environments controlled?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Environment architecture and access controls",
+          "Data flow policy between environments",
+          "Promotion/change control records",
         ],
         implementation_description:
-          "Describe how 'Data masking' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Separate dev, test, and prod environments by access and network, prohibit unmasked production data in lower environments, and control promotions through change management.",
         status: "Not Started",
         owner: "",
         reviewer: "",
@@ -3554,163 +3020,75 @@ export const ISO27001Annex = [
       },
       {
         index: 32,
-        title: "Network service security audit",
+        title: "Change management",
         requirement_summary:
-          "Implement clear and effective measures for 'Network service security audit' as part of technological controls to keep information secure.",
+          "Control changes to information processing facilities through formal procedures including submission, assessment, authorization, implementation, and review.",
         key_questions: [
-          "Do we have a written, approved process for 'Network service security audit'?",
-          "Who is responsible for ensuring 'Network service security audit' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Is there a formal change management process for information processing facilities?",
+          "Are changes assessed for security impact before implementation?",
+          "Are change records retained with approver and rollback details?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Change management procedure document",
+          "Change request records with approvals",
+          "Post-change review reports",
         ],
         implementation_description:
-          "Describe how 'Network service security audit' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Establish and operate a formal change management process covering submission, assessment, authorization, implementation, and post-change review for all information processing facility changes.",
         status: "Not Started",
         owner: "",
         reviewer: "",
         approver: "",
         due_date: "",
-        cross_mappings: [
-          {
-            framework: "ISO 42001",
-            clause_no: 8,
-            order_no: 2,
-            clause_title: "AI system security requirements",
-            relevance: "High",
-          },
-        ],
+        cross_mappings: [],
       },
       {
         index: 33,
-        title: "Network service security compliance",
+        title: "Test information",
         requirement_summary:
-          "Implement clear and effective measures for 'Network service security compliance' as part of technological controls to keep information secure.",
+          "Select, protect, and manage test information. Avoid production data with personal or sensitive content; apply masking or anonymization when production data must be used.",
         key_questions: [
-          "Do we have a written, approved process for 'Network service security compliance'?",
-          "Who is responsible for ensuring 'Network service security compliance' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "How is test information selected and protected?",
+          "Do we use production data for testing? If so, is it masked or anonymized?",
+          "Are access controls applied to test environments equivalent to production?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Test data management policy",
+          "Masking/anonymization procedures and tooling logs",
+          "Access control records for test environments",
         ],
         implementation_description:
-          "Describe how 'Network service security compliance' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Maintain a test data management policy that avoids production data with sensitive content. Where production data must be used, apply masking or anonymization and equivalent access controls.",
         status: "Not Started",
         owner: "",
         reviewer: "",
         approver: "",
         due_date: "",
-        cross_mappings: [
-          {
-            framework: "ISO 42001",
-            clause_no: 8,
-            order_no: 2,
-            clause_title: "AI system security requirements",
-            relevance: "High",
-          },
-        ],
+        cross_mappings: [],
       },
       {
         index: 34,
-        title: "Network service security reporting",
+        title: "Protection of information systems during audit testing",
         requirement_summary:
-          "Implement clear and effective measures for 'Network service security reporting' as part of technological controls to keep information secure.",
+          "Plan and coordinate audit tests to minimize business disruption. Restrict scope and schedule tests outside business hours where possible.",
         key_questions: [
-          "Do we have a written, approved process for 'Network service security reporting'?",
-          "Who is responsible for ensuring 'Network service security reporting' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
+          "Are audit tests planned with operational teams to minimize disruption?",
+          "Is the scope of each audit test defined in advance?",
+          "Are tests scheduled outside business hours where feasible?",
         ],
         evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
+          "Audit test plans with scope and schedule",
+          "Coordination records with operational teams",
+          "Post-test reports documenting impact",
         ],
         implementation_description:
-          "Describe how 'Network service security reporting' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
+          "Coordinate audit tests with operational owners; define scope and schedule in advance; prefer off-hours execution where feasible to protect information system availability.",
         status: "Not Started",
         owner: "",
         reviewer: "",
         approver: "",
         due_date: "",
-        cross_mappings: [
-          {
-            framework: "ISO 42001",
-            clause_no: 8,
-            order_no: 2,
-            clause_title: "AI system security requirements",
-            relevance: "High",
-          },
-        ],
-      },
-      {
-        index: 35,
-        title: "Network service security improvement",
-        requirement_summary:
-          "Implement clear and effective measures for 'Network service security improvement' as part of technological controls to keep information secure.",
-        key_questions: [
-          "Do we have a written, approved process for 'Network service security improvement'?",
-          "Who is responsible for ensuring 'Network service security improvement' is followed correctly?",
-          "Do we train staff or partners on this control?",
-          "How do we check or monitor that this control works as expected?",
-          "What actions do we take if this control fails or is not followed?",
-          "Do we gather evidence regularly to prove compliance with this control?",
-          "Has this control been updated to reflect new risks, technology, or regulations?",
-        ],
-        evidence_examples: [
-          "Documented policy or operating procedure specific to this control",
-          "Roles and responsibility assignments",
-          "Training materials, completion records, or awareness emails",
-          "System logs, monitoring reports, or access records",
-          "Incident and corrective action reports involving this control",
-          "Audit reports verifying control effectiveness",
-          "Change management records for updates to this control",
-        ],
-        implementation_description:
-          "Describe how 'Network service security improvement' is planned, implemented, communicated, and reviewed. Include tools, systems, or teams responsible. Mention how often this control is tested and improved.",
-        status: "Not Started",
-        owner: "",
-        reviewer: "",
-        approver: "",
-        due_date: "",
-        cross_mappings: [
-          {
-            framework: "ISO 42001",
-            clause_no: 8,
-            order_no: 2,
-            clause_title: "AI system security requirements",
-            relevance: "High",
-          },
-        ],
+        cross_mappings: [],
       },
     ],
   },
diff --git a/Servers/structures/ISO-27001/clauses/iso27001.clause.struct.ts b/Servers/structures/ISO-27001/clauses/iso27001.clause.struct.ts
index a9ceeedd30..396c11bcc5 100644
--- a/Servers/structures/ISO-27001/clauses/iso27001.clause.struct.ts
+++ b/Servers/structures/ISO-27001/clauses/iso27001.clause.struct.ts
@@ -266,6 +266,32 @@ export const ISO27001Clause = [
     arrangement: 6,
     title: "Planning",
     subclauses: [
+      {
+        arrangement: 6,
+        index: 1,
+        sub_index: 1,
+        title: "General — actions to address risks and opportunities",
+        requirement_summary:
+          "When planning for the ISMS, consider the issues from 4.1 and requirements from 4.2 to determine risks and opportunities that need to be addressed so the ISMS achieves its intended outcomes, prevents or reduces undesired effects, and supports continual improvement.",
+        key_questions: [
+          "Have we identified risks and opportunities based on context (4.1) and interested party requirements (4.2)?",
+          "Do planned actions integrate into ISMS processes?",
+          "How do we evaluate the effectiveness of these actions?",
+        ],
+        evidence_examples: [
+          "Risk and opportunity register linked to context analysis",
+          "Planning integration records",
+          "Effectiveness evaluation records",
+        ],
+        implementation_description:
+          "Maintain a risk and opportunity register derived from context analysis (4.1) and stakeholder requirements (4.2). Plan actions, integrate them into ISMS processes, and evaluate their effectiveness. This general planning step precedes the specific risk assessment (6.1.2) and risk treatment (6.1.3).",
+        status: "Not Started",
+        owner: "",
+        reviewer: "",
+        approver: "",
+        due_date: "",
+        cross_mappings: [],
+      },
       {
         arrangement: 6,
         index: 1,
@@ -362,11 +388,37 @@ export const ISO27001Clause = [
             framework: "ISO 42001",
             clause_no: 8,
             order_no: 4,
-            clause_title: "AI System Lifecycle",
+            clause_title: "AI system lifecycle",
             relevance: "High",
           },
         ],
-      }
+      },
+      {
+        arrangement: 6,
+        index: 3,
+        title: "Planning of changes",
+        requirement_summary:
+          "When the organization determines the need for changes to the ISMS, the changes shall be carried out in a planned manner.",
+        key_questions: [
+          "Is there a defined process for planning ISMS changes?",
+          "Are changes assessed for impact on risk assessments and the Statement of Applicability before implementation?",
+          "Are responsibilities, timelines, and resources documented?",
+        ],
+        evidence_examples: [
+          "ISMS change management procedure",
+          "Change request and impact assessment records",
+          "Approval records",
+          "Post-change review records",
+        ],
+        implementation_description:
+          "Manage ISMS changes through a formal change control process. Assess impact on existing risk assessments, controls, and the Statement of Applicability before approval. This clause is new in ISO 27001:2022.",
+        status: "Not Started",
+        owner: "",
+        reviewer: "",
+        approver: "",
+        due_date: "",
+        cross_mappings: [],
+      },
     ]
   },
   {
diff --git a/Servers/structures/ISO-42001/annex/annex.struct.ts b/Servers/structures/ISO-42001/annex/annex.struct.ts
index 5fc908c82e..986334bd1d 100644
--- a/Servers/structures/ISO-42001/annex/annex.struct.ts
+++ b/Servers/structures/ISO-42001/annex/annex.struct.ts
@@ -5,6 +5,8 @@ import { AISystemLifecycle } from "./annexcategories/08-AI-system-lifecycle.anne
 import { DataForAISystems } from "./annexcategories/09-data-for-AI-systems.annexcategory";
 import { ICT } from "./annexcategories/10-ict.annexcategory";
 import { ThirdPartyRelationships } from "./annexcategories/11-third-party-relationships.annexcategory";
+import { InterestedParties } from "./annexcategories/12-interested-parties.annexcategory";
+import { UseOfAISystems } from "./annexcategories/13-use-of-AI-systems.annexcategory";
 import { AnnexStructISO } from "../../../domain.layer/frameworks/ISO-42001/annexStructISO.model";
 
 export const Annex: AnnexStructISO[] = [
@@ -43,4 +45,14 @@ export const Annex: AnnexStructISO[] = [
     annex_no: 11,
     annexcategories: ThirdPartyRelationships,
   },
+  {
+    title: "A.12 Interested parties",
+    annex_no: 12,
+    annexcategories: InterestedParties,
+  },
+  {
+    title: "A.13 Use of AI systems",
+    annex_no: 13,
+    annexcategories: UseOfAISystems,
+  },
 ];
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/05-organizational-policies-and-governance.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/05-organizational-policies-and-governance.annexcategory.ts
index 97bcab55ef..ff22ab16ce 100644
--- a/Servers/structures/ISO-42001/annex/annexcategories/05-organizational-policies-and-governance.annexcategory.ts
+++ b/Servers/structures/ISO-42001/annex/annexcategories/05-organizational-policies-and-governance.annexcategory.ts
@@ -29,79 +29,11 @@ export const OrganizationalPoliciesAndGovernance: Partial<
       "A governance structure with defined roles and oversight committees has been established.",
     auditor_feedback: "Framework is robust; recommend more frequent audits.",
   },
-  {
-    sub_id: 3.1,
-    order_no: 3,
-    title: "AI roles and responsibilities",
-    description: "Defining and allocating AI responsibilities.",
-    guidance:
-      "All AI system related responsibilities should be defined and allocated.",
-    is_applicable: true,
-    implementation_description:
-      "All AI roles are documented with clear accountability matrices.",
-    auditor_feedback: "Role definitions are clear and well communicated.",
-  },
-  {
-    sub_id: 3.2,
-    order_no: 4,
-    title: "Segregation of duties",
-    description: "Separating conflicting duties related to AI.",
-    guidance:
-      "Conflicting duties and areas of responsibility should be segregated.",
-    is_applicable: false,
-    justification_for_exclusion:
-      "Small team size limits segregation of duties without significant resource burden.",
-    implementation_description: "",
-    auditor_feedback:
-      "Segregation is currently limited; recommend revisiting as the team grows.",
-  },
-  {
-    sub_id: 4.1,
-    order_no: 5,
-    title: "Accountability for AI systems",
-    description: "Assigning accountability for AI systems.",
-    guidance:
-      "Accountability should be assigned for the establishment, implementation, maintenance, monitoring, evaluation and improvement of the AIMS and for AI systems throughout their lifecycle.",
-    is_applicable: true,
-    implementation_description:
-      "Accountability assigned to AI project managers and system owners across lifecycle.",
-    auditor_feedback: "Good accountability tracking observed.",
-  },
-  {
-    sub_id: 5.1,
-    order_no: 6,
-    title: "Contact with authorities",
-    description: "Maintaining contact with relevant authorities.",
-    guidance:
-      "Appropriate contacts with relevant authorities should be maintained.",
-    is_applicable: true,
-    implementation_description:
-      "Regular communications maintained with regulatory bodies regarding AI compliance.",
-    auditor_feedback: "Effective liaison with authorities.",
-  },
-  {
-    sub_id: 5.2,
-    order_no: 7,
-    title: "Contact with special interest groups",
-    description: "Maintaining contact with special interest groups.",
-    guidance:
-      "Appropriate contacts with special interest groups and other specialist forums and professional associations should be maintained.",
-    is_applicable: false,
-    justification_for_exclusion:
-      "Organization has no active membership in AI special interest groups currently.",
-    implementation_description: "",
-    auditor_feedback: "No engagement noted; monitor for future opportunities.",
-  },
-  {
-    sub_id: 6.1,
-    order_no: 8,
-    title: "AI in project management",
-    description: "Integrating AI aspects into project management.",
-    guidance:
-      "AI should be integrated into the organization''s project management.",
-    is_applicable: true,
-    implementation_description:
-      "AI considerations integrated into project planning and risk management frameworks.",
-    auditor_feedback: "AI aspects are well embedded in projects.",
-  },
+  // NOTE: items previously at order_no 3-8 were de-duplicated / moved to A.6:
+  //   - 3.1 "AI roles and responsibilities" and 3.2 "Segregation of duties"
+  //     were duplicates of A.6.1.1 / A.6.1.2 and are removed.
+  //   - 4.1 "Accountability for AI systems", 5.1 "Contact with authorities",
+  //     5.2 "Contact with special interest groups", 6.1 "AI in project
+  //     management" belong under ISO A.3 (Internal organization = VW A.6) and
+  //     were reparented in migration 20260420105046-iso42001-dedupe-a5-move-to-a6.js
 ];
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/06-internal-organization.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/06-internal-organization.annexcategory.ts
index e383fdef63..28b7ac32f6 100644
--- a/Servers/structures/ISO-42001/annex/annexcategories/06-internal-organization.annexcategory.ts
+++ b/Servers/structures/ISO-42001/annex/annexcategories/06-internal-organization.annexcategory.ts
@@ -28,4 +28,51 @@ export const InternalOrganization: Partial<
       "Segregation implemented to reduce risks of unauthorized AI system modifications.",
     auditor_feedback: "Controls for segregation are effective.",
   },
+  {
+    sub_id: 2.1,
+    order_no: 3,
+    title: "Accountability for AI systems",
+    description: "Assigning accountability for AI systems.",
+    guidance:
+      "Accountability should be assigned for the establishment, implementation, maintenance, monitoring, evaluation and improvement of the AIMS and for AI systems throughout their lifecycle.",
+    is_applicable: true,
+    implementation_description:
+      "Accountability assigned to AI project managers and system owners across lifecycle.",
+    auditor_feedback: "Good accountability tracking observed.",
+  },
+  {
+    sub_id: 3.1,
+    order_no: 4,
+    title: "Contact with authorities",
+    description: "Maintaining contact with relevant authorities.",
+    guidance:
+      "Appropriate contacts with relevant authorities should be maintained.",
+    is_applicable: true,
+    implementation_description:
+      "Regular communications maintained with regulatory bodies regarding AI compliance.",
+    auditor_feedback: "Effective liaison with authorities.",
+  },
+  {
+    sub_id: 3.2,
+    order_no: 5,
+    title: "Contact with special interest groups",
+    description: "Maintaining contact with special interest groups.",
+    guidance:
+      "Appropriate contacts with special interest groups and other specialist forums and professional associations should be maintained.",
+    is_applicable: true,
+    implementation_description: "",
+    auditor_feedback: "Engage with relevant specialist forums to stay current with AI practices.",
+  },
+  {
+    sub_id: 4.1,
+    order_no: 6,
+    title: "AI in project management",
+    description: "Integrating AI aspects into project management.",
+    guidance:
+      "AI should be integrated into the organization's project management.",
+    is_applicable: true,
+    implementation_description:
+      "AI considerations integrated into project planning and risk management frameworks.",
+    auditor_feedback: "AI aspects are well embedded in projects.",
+  },
 ];
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/07-resource-for-AI-systems.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/07-resource-for-AI-systems.annexcategory.ts
index 7e7f017d60..84d078d026 100644
--- a/Servers/structures/ISO-42001/annex/annexcategories/07-resource-for-AI-systems.annexcategory.ts
+++ b/Servers/structures/ISO-42001/annex/annexcategories/07-resource-for-AI-systems.annexcategory.ts
@@ -47,11 +47,9 @@ export const ResourcesForAISystems: Partial<
     description: "Managing system resources for AI.",
     guidance:
       "System resources required for AI systems, including tools and infrastructure, should be managed throughout their lifecycle.",
-    is_applicable: false,
-    justification_for_exclusion:
-      "Legacy systems used do not support detailed resource lifecycle management.",
+    is_applicable: true,
     implementation_description: "",
-    auditor_feedback: "Consider upgrading systems for better resource control.",
+    auditor_feedback: "",
   },
   {
     sub_id: 5.1,
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/08-AI-system-lifecycle.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/08-AI-system-lifecycle.annexcategory.ts
index c2b36bb9a6..4ddc28b563 100644
--- a/Servers/structures/ISO-42001/annex/annexcategories/08-AI-system-lifecycle.annexcategory.ts
+++ b/Servers/structures/ISO-42001/annex/annexcategories/08-AI-system-lifecycle.annexcategory.ts
@@ -7,14 +7,16 @@ export const AISystemLifecycle: Partial<
   {
     sub_id: 1.1,
     order_no: 1,
-    title: "AI system lifecycle management",
-    description: "Establishing and managing a defined AI lifecycle process.",
+    title: "AI system lifecycle — overall approach",
+    description:
+      "Organizational overview of how the AI system lifecycle is governed end to end. Not a distinct ISO 42001 Annex A.5 control (the standard starts at A.5.2); retained as an umbrella item to record overall lifecycle posture.",
     guidance:
-      "A defined lifecycle process should be established and managed for AI systems, covering stages from conception through retirement, incorporating AI-specific considerations.",
+      "Describe, at a high level, how the organization structures the AI lifecycle end to end (requirements, design, data, build, V&V, deployment, operation, maintenance, retirement). The detailed ISO A.5.2–A.5.10 sub-controls are covered by the items that follow.",
     is_applicable: true,
     implementation_description:
-      "Lifecycle stages are documented and controlled from conception to retirement.",
-    auditor_feedback: "Lifecycle management aligns with best practices.",
+      "Summarize the organization's approach to lifecycle management — ownership, stage gates, documentation standards — rather than re-describing each stage (those are in the items below).",
+    auditor_feedback:
+      "This item is an organizational overview; the detailed stage-by-stage posture is covered by the following sub-controls.",
   },
   {
     sub_id: 2.1,
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/09-data-for-AI-systems.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/09-data-for-AI-systems.annexcategory.ts
index f2176f767f..a177032b33 100644
--- a/Servers/structures/ISO-42001/annex/annexcategories/09-data-for-AI-systems.annexcategory.ts
+++ b/Servers/structures/ISO-42001/annex/annexcategories/09-data-for-AI-systems.annexcategory.ts
@@ -77,4 +77,74 @@ export const DataForAISystems: Partial<
       "Data is securely stored, accessed, transmitted, and disposed per classification.",
     auditor_feedback: "Secure data handling procedures are in place.",
   },
+  {
+    sub_id: 7.1,
+    order_no: 7,
+    title: "Data labeling and annotation",
+    description:
+      "Managing data labeling and annotation processes for AI systems.",
+    guidance:
+      "Data labeling and annotation processes should be defined, documented, and quality-controlled to ensure labels are accurate, consistent, and appropriate for the intended AI system purpose. Labeler qualifications and inter-annotator agreement should be monitored.",
+    is_applicable: true,
+    implementation_description:
+      "Data labeling processes include defined guidelines, qualified annotators, and quality checks for consistency.",
+    auditor_feedback:
+      "Labeling processes are documented. Recommend measuring inter-annotator agreement formally.",
+  },
+  {
+    sub_id: 8.1,
+    order_no: 8,
+    title: "Data bias assessment",
+    description:
+      "Assessing and mitigating bias in data used for AI systems.",
+    guidance:
+      "Data used for AI systems should be assessed for potential biases that could lead to unfair, discriminatory, or harmful outcomes. Identified biases should be documented and mitigated through appropriate techniques.",
+    is_applicable: true,
+    implementation_description:
+      "Bias assessments are conducted on training and evaluation datasets. Identified biases are documented with mitigation strategies.",
+    auditor_feedback:
+      "Bias assessment processes exist. Ensure assessments are repeated when data sources change.",
+  },
+  {
+    sub_id: 9.1,
+    order_no: 9,
+    title: "Data retention",
+    description:
+      "Defining and implementing data retention policies for AI-related data.",
+    guidance:
+      "Retention periods for data used in AI systems — including training data, validation data, model outputs, and logs — should be defined based on legal, regulatory, and operational requirements, and enforced through documented procedures.",
+    is_applicable: true,
+    implementation_description:
+      "Data retention policies define periods for training data, model artifacts, and operational logs in compliance with regulatory requirements.",
+    auditor_feedback:
+      "Retention policies are documented. Verify automated enforcement of retention periods.",
+  },
+  {
+    sub_id: 10.1,
+    order_no: 10,
+    title: "Data deletion and disposal",
+    description:
+      "Secure deletion and disposal of AI-related data.",
+    guidance:
+      "Data used in AI systems should be securely deleted or disposed of when no longer needed or when retention periods expire, ensuring that deletion is complete and verifiable, particularly for personal or sensitive data.",
+    is_applicable: true,
+    implementation_description:
+      "Secure deletion procedures ensure complete removal of expired AI data with verification records.",
+    auditor_feedback:
+      "Deletion procedures exist. Recommend periodic verification that deletion is complete across all storage locations including backups.",
+  },
+  {
+    sub_id: 11.1,
+    order_no: 11,
+    title: "Data transfer",
+    description:
+      "Managing the transfer of data used in AI systems.",
+    guidance:
+      "Transfer of data used in AI systems — whether internal or to third parties — should be governed by documented procedures addressing authorization, encryption, contractual safeguards, and compliance with data protection regulations including cross-border transfer restrictions.",
+    is_applicable: true,
+    implementation_description:
+      "Data transfer procedures govern authorization, encryption, and contractual requirements for internal and external transfers.",
+    auditor_feedback:
+      "Transfer controls are in place. Ensure cross-border transfer assessments are documented for all AI data sharing arrangements.",
+  },
 ];
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/10-ict.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/10-ict.annexcategory.ts
index 6397ef8b9e..84657eeb74 100644
--- a/Servers/structures/ISO-42001/annex/annexcategories/10-ict.annexcategory.ts
+++ b/Servers/structures/ISO-42001/annex/annexcategories/10-ict.annexcategory.ts
@@ -47,11 +47,8 @@ export const ICT: Partial<AnnexCategoryStructISO & AnnexCategoryISO>[] = [
     description: "Ensuring AI systems are resilient to failures and attacks.",
     guidance:
       "AI systems should be designed and operated to be resilient against failures, errors, and attacks.",
-    is_applicable: false,
-    justification_for_exclusion:
-      "Current AI deployments are limited and do not yet require advanced resilience measures.",
+    is_applicable: true,
     implementation_description: "",
-    auditor_feedback:
-      "Recommend planning for resilience as AI footprint expands.",
+    auditor_feedback: "",
   },
 ];
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/12-interested-parties.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/12-interested-parties.annexcategory.ts
new file mode 100644
index 0000000000..3208978737
--- /dev/null
+++ b/Servers/structures/ISO-42001/annex/annexcategories/12-interested-parties.annexcategory.ts
@@ -0,0 +1,55 @@
+import { AnnexCategoryISO } from "../../../../domain.layer/frameworks/ISO-42001/annexCategoryISO.model";
+import { AnnexCategoryStructISO } from "../../../../domain.layer/frameworks/ISO-42001/annexCategoryStructISO.model";
+
+/**
+ * VW A.12 / ISO 42001 A.9 — Interested parties.
+ * Aligns with ISO 42001 Annex A.9: notification, communication, and addressing
+ * of concerns from interested parties affected by the organization's AI
+ * systems.
+ */
+export const InterestedParties: Partial<
+  AnnexCategoryStructISO & AnnexCategoryISO
+>[] = [
+  {
+    sub_id: 1.1,
+    order_no: 1,
+    title: "Notification to interested parties",
+    description:
+      "Notifying affected individuals and relevant parties about AI system use and its potential impacts.",
+    guidance:
+      "The organization should establish processes for notifying interested parties about AI system deployment, its purpose, and potential impacts on them, in accordance with applicable legal, regulatory, and contractual requirements.",
+    is_applicable: true,
+    implementation_description:
+      "Notification processes are in place to inform affected parties about AI system deployment and impacts.",
+    auditor_feedback:
+      "Notification mechanisms exist. Verify coverage across all deployed AI systems.",
+  },
+  {
+    sub_id: 2.1,
+    order_no: 2,
+    title: "Communication with interested parties",
+    description:
+      "Establishing effective communication channels with interested parties regarding AI systems.",
+    guidance:
+      "The organization should establish and maintain communication channels that allow interested parties to raise questions, provide feedback, and receive information about the organization's AI systems and their governance.",
+    is_applicable: true,
+    implementation_description:
+      "Communication channels (helpdesk, public disclosure, feedback forms) enable interested party engagement on AI topics.",
+    auditor_feedback:
+      "Communication channels are defined. Ensure responsiveness is measured and reported.",
+  },
+  {
+    sub_id: 3.1,
+    order_no: 3,
+    title: "Addressing interested parties' concerns",
+    description:
+      "Processes for receiving, evaluating, and responding to concerns raised by interested parties about AI systems.",
+    guidance:
+      "The organization should establish processes for receiving, recording, evaluating, and responding to concerns raised by interested parties regarding the development, deployment, or operation of AI systems, including mechanisms for escalation and resolution.",
+    is_applicable: true,
+    implementation_description:
+      "A formal process for receiving, tracking, and resolving concerns about AI systems from interested parties is operational.",
+    auditor_feedback:
+      "Concern resolution process exists. Recommend tracking resolution times and satisfaction outcomes.",
+  },
+];
diff --git a/Servers/structures/ISO-42001/annex/annexcategories/13-use-of-AI-systems.annexcategory.ts b/Servers/structures/ISO-42001/annex/annexcategories/13-use-of-AI-systems.annexcategory.ts
new file mode 100644
index 0000000000..ec316db2e3
--- /dev/null
+++ b/Servers/structures/ISO-42001/annex/annexcategories/13-use-of-AI-systems.annexcategory.ts
@@ -0,0 +1,54 @@
+import { AnnexCategoryISO } from "../../../../domain.layer/frameworks/ISO-42001/annexCategoryISO.model";
+import { AnnexCategoryStructISO } from "../../../../domain.layer/frameworks/ISO-42001/annexCategoryStructISO.model";
+
+/**
+ * VW A.13 / ISO 42001 A.10 — Use of AI systems.
+ * Responsible use, intended-use documentation, and transparency for users of
+ * AI systems operated by the organization.
+ */
+export const UseOfAISystems: Partial<
+  AnnexCategoryStructISO & AnnexCategoryISO
+>[] = [
+  {
+    sub_id: 1.1,
+    order_no: 1,
+    title: "Responsible use of AI",
+    description:
+      "Ensuring AI systems are used responsibly and in accordance with organizational policies and ethical principles.",
+    guidance:
+      "The organization should establish policies and procedures to ensure AI systems are used responsibly, including appropriate human oversight, monitoring of outcomes, and adherence to ethical principles and organizational AI policy throughout operation.",
+    is_applicable: true,
+    implementation_description:
+      "Responsible use policies define human oversight requirements, monitoring obligations, and ethical boundaries for AI system operation.",
+    auditor_feedback:
+      "Responsible use policies are documented. Verify operational adherence through periodic spot checks.",
+  },
+  {
+    sub_id: 2.1,
+    order_no: 2,
+    title: "Intended use documentation",
+    description:
+      "Documenting the intended purpose, conditions of use, and known limitations of AI systems.",
+    guidance:
+      "The intended purpose, operational conditions, known limitations, and boundaries of each AI system should be clearly documented and communicated to users and operators to prevent misuse and ensure appropriate application.",
+    is_applicable: true,
+    implementation_description:
+      "Each AI system has documented intended use specifications including purpose, operational boundaries, known limitations, and prohibited uses.",
+    auditor_feedback:
+      "Intended use documentation exists for major systems. Ensure coverage extends to all deployed AI systems including embedded components.",
+  },
+  {
+    sub_id: 3.1,
+    order_no: 3,
+    title: "Transparency for users of AI systems",
+    description:
+      "Providing users with clear information about AI system behavior, capabilities, and limitations.",
+    guidance:
+      "Users of AI systems should be provided with clear, accessible information about how the AI system works, what it can and cannot do, the basis for its outputs, and how to interpret results, appropriate to the user's role and context.",
+    is_applicable: true,
+    implementation_description:
+      "User-facing documentation and in-system disclosures explain AI behavior, output interpretation, confidence levels, and limitations.",
+    auditor_feedback:
+      "Transparency measures are in place. Recommend testing user comprehension to validate effectiveness.",
+  },
+];
diff --git a/Servers/structures/ISO-42001/clauses/subclauses/06-planning.subclause.ts b/Servers/structures/ISO-42001/clauses/subclauses/06-planning.subclause.ts
index d91c408127..af055bb8d2 100644
--- a/Servers/structures/ISO-42001/clauses/subclauses/06-planning.subclause.ts
+++ b/Servers/structures/ISO-42001/clauses/subclauses/06-planning.subclause.ts
@@ -1,37 +1,15 @@
 import { SubClauseISO } from "../../../../domain.layer/frameworks/ISO-42001/subClauseISO.model";
 import { SubClauseStructISO } from "../../../../domain.layer/frameworks/ISO-42001/subClauseStructISO.model";
 
+// NOTE: ISO 42001 Clause 6 in the standard uses a three-level hierarchy —
+// 6.1.1 General, 6.1.2 AI risk assessment, 6.1.3 AI risk treatment,
+// 6.1.4 AI system impact assessment, 6.2 AI objectives, 6.3 Planning of
+// changes. The three-level children (6.1.1-6.1.4) and 6.3 are populated by
+// dedicated migrations (20260420105041, 20260420105042) rather than this
+// struct file. The old 2-level "6.1 Actions to address risks and
+// opportunities" merged entry was removed to match the standard shape; its
+// companion cleanup lives in 20260421170142-iso42001-remove-old-merged-6-1.js.
 export const Planning: Partial<SubClauseStructISO & SubClauseISO>[] = [
-  {
-    title:
-      "Actions to address risks and opportunities (Includes Risk Assessment, Treatment, Impact Assessment)",
-    order_no: 1,
-    summary:
-      "Plan actions based on context, stakeholders, risks, and opportunities. Conduct AI risk assessments, plan risk treatments, and assess AI system impacts.",
-    questions: [
-      "Do we have a process for identifying risks and opportunities related to the AIMS?",
-      "Is there a defined AI risk assessment methodology?",
-      "Are risks related to AI systems (bias, fairness, transparency, security, societal impact etc.) systematically identified and assessed?",
-      "Is there a process for selecting risk treatment options and controls?",
-      "Is a Statement of Applicability (SoA) maintained?",
-      "Do we assess the potential positive and negative impacts of our AI systems on individuals and society?",
-      "How are risk assessment and impact assessment results used in planning?",
-    ],
-    evidence_examples: [
-      "Risk management framework/policy/procedure",
-      "AI Risk Assessment Methodology",
-      "Risk assessment reports per AI system",
-      "AI Risk Register",
-      "AI Risk Treatment Plan",
-      "Statement of Applicability (SoA)",
-      "AI Impact Assessment Methodology",
-      "AI Impact Assessment reports",
-    ],
-    implementation_description:
-      "The organization uses a documented AI risk assessment and impact assessment methodology, reviewed annually, with outputs stored in a central risk register and treatment plan.",
-    auditor_feedback:
-      "Comprehensive risk framework in place. Suggest improving traceability between specific AI systems and their associated risks and treatments.",
-  },
   {
     title: "AI objectives and planning to achieve them",
     order_no: 2,
diff --git a/Servers/structures/ISO-42001/clauses/subclauses/08-operation.subclause.ts b/Servers/structures/ISO-42001/clauses/subclauses/08-operation.subclause.ts
index 14f428a402..0ae936cc1b 100644
--- a/Servers/structures/ISO-42001/clauses/subclauses/08-operation.subclause.ts
+++ b/Servers/structures/ISO-42001/clauses/subclauses/08-operation.subclause.ts
@@ -59,7 +59,7 @@ export const Operation: Partial<SubClauseStructISO & SubClauseISO>[] = [
       "Implementation is traceable. Recommend adding automated control verification for higher-risk systems.",
   },
   {
-    title: "AI System Lifecycle",
+    title: "AI system lifecycle",
     order_no: 4,
     summary:
       "Define and implement processes for managing the entire AI system lifecycle consistent with policy, objectives, and impact assessments.",
@@ -86,26 +86,8 @@ export const Operation: Partial<SubClauseStructISO & SubClauseISO>[] = [
     auditor_feedback:
       "Lifecycle approach is well-structured. Suggest more emphasis on bias mitigation during model training and validation.",
   },
-  {
-    title: "Third-party relationships",
-    order_no: 5,
-    summary:
-      "Manage risks associated with third-party suppliers/partners involved in the AI lifecycle.",
-    questions: [
-      "How do we identify and assess risks related to third-party AI components or services?",
-      "Are AI-specific requirements included in contracts?",
-      "How do we monitor third-party performance and compliance?",
-    ],
-    evidence_examples: [
-      "Third-party risk management procedure",
-      "Supplier assessment questionnaires/reports",
-      "Contracts with AI clauses",
-      "Supplier audit reports",
-      "Service Level Agreements (SLAs)",
-    ],
-    implementation_description:
-      "Third-party risks are assessed during onboarding and annually thereafter. Contracts include AI-specific obligations and audit clauses.",
-    auditor_feedback:
-      "Good supplier oversight. Recommend periodic spot checks to ensure compliance with contractual AI clauses.",
-  },
+  // NOTE: 8.5 "Third-party relationships" was removed — it does not exist in
+  // ISO 42001 clause 8 (which only goes to 8.4). The same content is covered by
+  // Annex A.11 (VW A.11 / ISO A.8). See migration
+  // 20260420105043-iso42001-remove-phantom-8-5.js
 ];
diff --git a/Servers/tools/mjmlCompiler.ts b/Servers/tools/mjmlCompiler.ts
index 1013f479c8..dcc267d556 100644
--- a/Servers/tools/mjmlCompiler.ts
+++ b/Servers/tools/mjmlCompiler.ts
@@ -13,7 +13,12 @@ export const compileMjmlToHtml = (
     );
   });
 
-  // Convert MJML to HTML
-  const { html } = mjml2html(compiledTemplate);
+  // Convert MJML to HTML. `mjml@4.x` runtime is synchronous; newer
+  // `@types/mjml-core` published on DefinitelyTyped types the return as
+  // `Promise<MJMLParseResults>`, which breaks the build when Docker resolves
+  // fresh (Dockerfile intentionally skips the lockfile). Cast through
+  // `unknown` so the code works under both the old sync and newer Promise-typed
+  // signatures — the actual runtime shape is sync.
+  const { html } = mjml2html(compiledTemplate) as unknown as { html: string };
   return html;
 };
diff --git a/Servers/utils/auditLedger.utils.ts b/Servers/utils/auditLedger.utils.ts
index 04f5c693dd..78d83d3d44 100644
--- a/Servers/utils/auditLedger.utils.ts
+++ b/Servers/utils/auditLedger.utils.ts
@@ -73,10 +73,24 @@ async function isAuditLedgerEnabled(organizationId: number): Promise<boolean> {
 }
 
 /**
- * Append an entry to the audit_ledger using a SERIALIZABLE transaction.
+ * Namespace key for `pg_advisory_xact_lock(AUDIT_LEDGER_LOCK_NS, organization_id)`.
+ * Any fixed int works; using a project-unique value avoids collisions with
+ * other code that might take advisory locks.
+ */
+const AUDIT_LEDGER_LOCK_NS = 9001;
+
+/**
+ * Append an entry to the audit_ledger.
+ *
+ * Concurrency: appends within a single organization are linearized by a
+ * per-org `pg_advisory_xact_lock`. This guarantees the read of the last
+ * entry's hash and the follow-up INSERT are never interleaved with another
+ * append for the same org, so the hash chain stays consistent without
+ * relying on SERIALIZABLE isolation (which would thrash with 40001s under
+ * concurrent writes).
  *
  * Flow:
- * 1. Check if audit ledger is enabled for this organization
+ * 1. Acquire per-org advisory lock (released at transaction end)
  * 2. Get the prev_hash from the last entry (or GENESIS_HASH)
  * 3. INSERT with entry_hash = 'pending' sentinel
  * 4. Compute the real hash using the assigned id
@@ -92,11 +106,19 @@ export async function appendToAuditLedger(
   // Skip if audit ledger is disabled for this organization
   if (!(await isAuditLedgerEnabled(organizationId))) return;
 
-  const txn: Transaction = await sequelize.transaction({
-    isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE,
-  });
+  const txn: Transaction = await sequelize.transaction();
 
   try {
+    // Step 0: Serialize appends per-org. Released when the txn ends.
+    await sequelize.query(
+      `SELECT pg_advisory_xact_lock(:ns, :organizationId)`,
+      {
+        replacements: { ns: AUDIT_LEDGER_LOCK_NS, organizationId },
+        type: QueryTypes.SELECT,
+        transaction: txn,
+      }
+    );
+
     // Step 1: Get the previous hash
     const lastRows: any[] = await sequelize.query(
       `SELECT entry_hash FROM audit_ledger
@@ -173,7 +195,17 @@ export async function appendToAuditLedger(
 
     await txn.commit();
   } catch (error) {
-    await txn.rollback();
+    // If the failure happened during commit itself, the transaction is
+    // already marked finished and Sequelize will throw "cannot be rolled
+    // back because it has been finished" — masking the real cause. Only
+    // roll back if the transaction is still open.
+    if (!(txn as unknown as { finished?: string }).finished) {
+      try {
+        await txn.rollback();
+      } catch {
+        // swallow — we're already surfacing the original error
+      }
+    }
     throw error;
   }
 }
diff --git a/Servers/utils/control.utils.ts b/Servers/utils/control.utils.ts
index 1db5ce2729..b788d0ce36 100644
--- a/Servers/utils/control.utils.ts
+++ b/Servers/utils/control.utils.ts
@@ -183,12 +183,12 @@ export const createNewControlsQuery = async (
     order_no: number;
     title: string;
     description: string;
-    implementation_details: string;
+    implementation_details?: string;
     subControls: {
       order_no: number;
       title: string;
       description: string;
-      implementation_details: string;
+      implementation_details?: string;
       evidence_description?: string;
       feedback_description?: string;
     }[];
@@ -214,7 +214,7 @@ export const createNewControlsQuery = async (
         order_no: controlStruct.order_no,
         control_category_id: controlCategoryId,
         implementation_details: enable_ai_data_insertion
-          ? controlStruct.implementation_details
+          ? controlStruct.implementation_details ?? null
           : null,
         status: enable_ai_data_insertion ? "Waiting" : null,
       },
diff --git a/Servers/utils/eu.utils.ts b/Servers/utils/eu.utils.ts
index 1b312fe4f5..67274aa939 100644
--- a/Servers/utils/eu.utils.ts
+++ b/Servers/utils/eu.utils.ts
@@ -637,6 +637,89 @@ export const getAssessmentsEUByProjectIdQuery = async (
   return assessments;
 };
 
+/**
+ * Resolve which EU AI Act category ids are visible to a project, given its
+ * `type_of_high_risk_role` + `ai_risk_classification`. Returns `null` when
+ * either is missing — callers should interpret that as "no filter, show all".
+ *
+ * Rules:
+ *   - Categories tagged `General Risk` always show (horizontal obligations
+ *     like Art 4 AI literacy that apply regardless of risk level).
+ *   - Categories matching the project's tier show. Role is additionally
+ *     required to match when the selected tier is `High risk` or `GPAI`
+ *     (those are the only tiers where provider/deployer obligations diverge).
+ *   - For Prohibited / Limited risk / Minimal risk, role is ignored — both
+ *     providers and deployers see the same list.
+ *
+ * Both `type_of_high_risk_role` and `ai_risk_classification` are required on
+ * project-based framework creation (validated on the form), so we treat them
+ * as always-set for EU AI Act projects.
+ */
+export const getVisibleEuCategoryIdsForProject = async (
+  projectFrameworkId: number,
+  organizationId: number,
+  transaction: Transaction | null = null
+): Promise<number[]> => {
+  const [[project]] = (await sequelize.query(
+    `SELECT p.type_of_high_risk_role AS role, p.ai_risk_classification AS tier
+     FROM projects p
+     JOIN projects_frameworks pf ON pf.project_id = p.id
+       AND pf.organization_id = p.organization_id
+     WHERE pf.id = :projectFrameworkId
+       AND pf.organization_id = :organizationId
+     LIMIT 1;`,
+    {
+      replacements: { projectFrameworkId, organizationId },
+      ...(transaction ? { transaction } : {}),
+    }
+  )) as [{ role: string; tier: string }[], number];
+
+  const ROLE_FILTERED_TIERS = new Set(["High risk", "GPAI"]);
+  const applyRoleFilter = ROLE_FILTERED_TIERS.has(project.tier);
+
+  const [rows] = (await sequelize.query(
+    `SELECT cc.id
+     FROM controlcategories_struct_eu cc
+     JOIN frameworks f ON f.id = cc.framework_id
+     WHERE f.name = 'EU AI Act'
+       AND (
+         EXISTS (
+           SELECT 1 FROM controlcategories_struct_eu__risk_tiers cct
+           JOIN eu_act_risk_tiers rt ON rt.id = cct.risk_tier_id
+           WHERE cct.control_category_id = cc.id
+             AND rt.name = 'General Risk'
+         )
+         OR (
+           EXISTS (
+             SELECT 1 FROM controlcategories_struct_eu__risk_tiers cct
+             JOIN eu_act_risk_tiers rt ON rt.id = cct.risk_tier_id
+             WHERE cct.control_category_id = cc.id
+               AND rt.name = :tier
+           )
+           AND (
+             :applyRoleFilter = FALSE
+             OR EXISTS (
+               SELECT 1 FROM controlcategories_struct_eu__roles ccr
+               JOIN eu_act_roles r ON r.id = ccr.role_id
+               WHERE ccr.control_category_id = cc.id
+                 AND r.name = :role
+             )
+           )
+         )
+       );`,
+    {
+      replacements: {
+        tier: project.tier,
+        role: project.role,
+        applyRoleFilter,
+      },
+      ...(transaction ? { transaction } : {}),
+    }
+  )) as [{ id: number }[], number];
+
+  return rows.map((r) => r.id);
+};
+
 export const getComplianceEUByProjectIdQuery = async (
   projectFrameworkId: number,
   organizationId: number
@@ -652,7 +735,13 @@ export const getComplianceEUByProjectIdQuery = async (
     controlIds[0].map((c) => c.id),
     organizationId
   );
-  return compliances;
+
+  const visibleIds = await getVisibleEuCategoryIdsForProject(
+    projectFrameworkId,
+    organizationId
+  );
+  const allowed = new Set(visibleIds);
+  return (compliances as any[]).filter((cc) => allowed.has(cc.id));
 };
 
 export const createNewAssessmentEUQuery = async (
diff --git a/Servers/utils/iso27001.utils.ts b/Servers/utils/iso27001.utils.ts
index 4623d47c2c..3d57145719 100644
--- a/Servers/utils/iso27001.utils.ts
+++ b/Servers/utils/iso27001.utils.ts
@@ -182,7 +182,7 @@ export const getAllClausesWithSubClauseQuery = async (
 
   for (let clause of clauses[0]) {
     const subClauses = (await sequelize.query(
-      `SELECT sc.id, scs.title, scs.order_no, sc.status, sc.owner FROM subclauses_struct_iso27001 scs JOIN subclauses_iso27001 sc ON scs.id = sc.subclause_meta_id WHERE sc.organization_id = :organizationId AND scs.clause_id = :id AND sc.projects_frameworks_id = :projects_frameworks_id ORDER BY scs.id;`,
+      `SELECT sc.id, scs.title, scs.order_no, scs.subclause_id, sc.status, sc.owner FROM subclauses_struct_iso27001 scs JOIN subclauses_iso27001 sc ON scs.id = sc.subclause_meta_id WHERE sc.organization_id = :organizationId AND scs.clause_id = :id AND sc.projects_frameworks_id = :projects_frameworks_id ORDER BY scs.order_no;`,
       {
         replacements: {
           organizationId,
@@ -300,15 +300,20 @@ export const getClauseById = async (
 export const getSubClausesByClauseIdQuery = async (
   clauseId: number,
   organizationId: number,
+  projectFrameworkId: number,
   transaction: Transaction | null = null
 ) => {
   const subClauses = await sequelize.query(
-    `SELECT sc.id, scs.title, scs.order_no, scs.clause_id, scs.requirement_summary, scs.key_questions, scs.evidence_examples,
+    `SELECT sc.id, scs.title, scs.order_no, scs.subclause_id, scs.clause_id, scs.requirement_summary, scs.key_questions, scs.evidence_examples,
             sc.owner AS owner, sc.reviewer AS reviewer, sc.due_date, sc.status
     FROM subclauses_iso27001 sc JOIN subclauses_struct_iso27001 scs ON
-    sc.subclause_meta_id = scs.id WHERE sc.organization_id = :organizationId AND scs.clause_id = :id ORDER BY scs.id;`,
+    sc.subclause_meta_id = scs.id
+    WHERE sc.organization_id = :organizationId
+      AND scs.clause_id = :id
+      AND sc.projects_frameworks_id = :projectFrameworkId
+    ORDER BY scs.order_no;`,
     {
-      replacements: { organizationId, id: clauseId },
+      replacements: { organizationId, id: clauseId, projectFrameworkId },
       mapToModel: true,
       ...(transaction ? { transaction } : {}),
     }
diff --git a/Servers/utils/iso42001.utils.ts b/Servers/utils/iso42001.utils.ts
index d009b76754..4b470d7c8f 100644
--- a/Servers/utils/iso42001.utils.ts
+++ b/Servers/utils/iso42001.utils.ts
@@ -185,7 +185,7 @@ export const getAllClausesWithSubClauseQuery = async (
 
   for (let clause of clauses[0]) {
     const subClauses = (await sequelize.query(
-      `SELECT sc.id, scs.title, scs.order_no, sc.status, sc.owner FROM subclauses_struct_iso scs JOIN subclauses_iso sc ON scs.id = sc.subclause_meta_id WHERE sc.organization_id = :organizationId AND scs.clause_id = :id AND sc.projects_frameworks_id = :projects_frameworks_id ORDER BY scs.id;`,
+      `SELECT sc.id, scs.title, scs.order_no, scs.subclause_id, sc.status, sc.owner FROM subclauses_struct_iso scs JOIN subclauses_iso sc ON scs.id = sc.subclause_meta_id WHERE sc.organization_id = :organizationId AND scs.clause_id = :id AND sc.projects_frameworks_id = :projects_frameworks_id ORDER BY scs.order_no;`,
       {
         replacements: {
           organizationId,
@@ -297,15 +297,20 @@ export const getClauseById = async (
 export const getSubClausesByClauseIdQuery = async (
   clauseId: number,
   organizationId: number,
+  projectFrameworkId: number,
   transaction: Transaction | null = null
 ) => {
   const subClauses = await sequelize.query(
-    `SELECT sc.id, scs.title, scs.order_no, scs.clause_id, scs.summary, scs.questions, scs.evidence_examples,
+    `SELECT sc.id, scs.title, scs.order_no, scs.subclause_id, scs.clause_id, scs.summary, scs.questions, scs.evidence_examples,
             sc.owner AS owner, sc.reviewer AS reviewer, sc.due_date, sc.status
     FROM subclauses_iso sc JOIN subclauses_struct_iso scs ON
-    sc.subclause_meta_id = scs.id WHERE sc.organization_id = :organizationId AND scs.clause_id = :id ORDER BY scs.id;`,
+    sc.subclause_meta_id = scs.id
+    WHERE sc.organization_id = :organizationId
+      AND scs.clause_id = :id
+      AND sc.projects_frameworks_id = :projectFrameworkId
+    ORDER BY scs.order_no;`,
     {
-      replacements: { organizationId, id: clauseId },
+      replacements: { organizationId, id: clauseId, projectFrameworkId },
       mapToModel: true,
       ...(transaction ? { transaction } : {}),
     }
diff --git a/Servers/utils/subControl.utils.ts b/Servers/utils/subControl.utils.ts
index 4da0c5f5e7..ce5e0dcc37 100644
--- a/Servers/utils/subControl.utils.ts
+++ b/Servers/utils/subControl.utils.ts
@@ -486,7 +486,7 @@ export const createNewSubControlsQuery = async (
     order_no: number;
     title: string;
     description: string;
-    implementation_details: string;
+    implementation_details?: string;
     evidence_description?: string;
     feedback_description?: string;
   }[],
@@ -511,7 +511,7 @@ export const createNewSubControlsQuery = async (
         control_id: controlId,
         order_no: subControl.order_no,
         implementation_details: enable_ai_data_insertion
-          ? subControl.implementation_details
+          ? subControl.implementation_details ?? null
           : null,
         evidence_description:
           enable_ai_data_insertion && subControl.evidence_description