diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
index a1cb09b..19c6674 100644
--- a/.claude-plugin/plugin.json
+++ b/.claude-plugin/plugin.json
@@ -6,6 +6,6 @@
     "name": "Kjell Tore Guttormsen"
   },
   "license": "MIT",
-  "repository": "https://git.fromaitochitta.com/open/ktg-plugin-marketplace",
+  "repository": "https://git.fromaitochitta.com/open/ms-ai-architect",
   "keywords": ["microsoft", "azure", "ai-architect", "governance", "security", "norwegian-public-sector", "eu-ai-act"]
 }
diff --git a/agents/adr-writer-agent.md b/agents/adr-writer-agent.md
index 6651858..11f6352 100644
--- a/agents/adr-writer-agent.md
+++ b/agents/adr-writer-agent.md
@@ -40,7 +40,7 @@ Et kompakt sammendrag av virksomhetskonteksten injiseres ambient i hovedøkten v
 
 ### 1. Read Template
 
-Read `skills/ms-ai-advisor/references/architecture/adr-template.md` for the MADR v3.0 format.
+Read `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/adr-template.md` for the MADR v3.0 format.
 
 ### 2. Parse Input
 
diff --git a/agents/ai-act-assessor.md b/agents/ai-act-assessor.md
index 2cb0fdd..731e3ed 100644
--- a/agents/ai-act-assessor.md
+++ b/agents/ai-act-assessor.md
@@ -23,17 +23,17 @@ You are a Norwegian regulatory compliance specialist focused on EU AI Act assess
 ## Knowledge Base References
 
 Read relevant files from:
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-classification-methodology.md` — **OBLIGATORISK:** 4-stegs klassifiseringsmetodikk
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md` — Provider-forpliktelser Art. 9-27
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md` — Deployer-forpliktelser Art. 26-27
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-fria-template.md` — FRIA-mal Art. 27
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-conformity-assessment.md` — Samsvarsvurdering Annex IV/VI/VII
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-transparency-notices.md` — Art. 13/50 transparensnotiser
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-microsoft-tools-mapping.md` — Artikkel-til-verktøy-mapping
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-compliance-guide.md` — Generell compliance-veileder
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-annex-iii-checklist.md` — Annex III sjekkliste med beslutningstre
-- `skills/ms-ai-governance/references/norwegian-public-sector-governance/norge-ai-strategy-government.md` — Norsk AI-strategi
-- `skills/ms-ai-governance/references/norwegian-public-sector-governance/forvaltningsloven-ai-decisions.md` — Forvaltningsloven og AI
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-classification-methodology.md` — **OBLIGATORISK:** 4-stegs klassifiseringsmetodikk
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md` — Provider-forpliktelser Art. 9-27
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md` — Deployer-forpliktelser Art. 26-27
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-fria-template.md` — FRIA-mal Art. 27
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-conformity-assessment.md` — Samsvarsvurdering Annex IV/VI/VII
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-transparency-notices.md` — Art. 13/50 transparensnotiser
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-microsoft-tools-mapping.md` — Artikkel-til-verktøy-mapping
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-compliance-guide.md` — Generell compliance-veileder
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-annex-iii-checklist.md` — Annex III sjekkliste med beslutningstre
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/norge-ai-strategy-government.md` — Norsk AI-strategi
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/forvaltningsloven-ai-decisions.md` — Forvaltningsloven og AI
 
 ## Virksomhetskontekst (automatisk)
 
diff --git a/agents/architecture-review-agent.md b/agents/architecture-review-agent.md
index fb73a42..ccb189c 100644
--- a/agents/architecture-review-agent.md
+++ b/agents/architecture-review-agent.md
@@ -63,7 +63,7 @@ For høyrisiko-systemer, verifiser:
 - [ ] **FRIA gjennomført (Art. 27):** Obligatorisk for offentlig sektor-deployers
 
 **Ekstra KB-referanse:**
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-conformity-assessment.md`
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-conformity-assessment.md`
 
 ### 3. Utredningsinstruksen (Analysis Requirements)
 - **Problem description**: Clear problem statement, affected parties identified
@@ -156,12 +156,12 @@ Read the architecture proposal. Extract:
 
 ### 2. Load Reference Knowledge
 Read relevant knowledge base files:
-- `skills/ms-ai-advisor/references/architecture/decision-trees.md` — Platform selection validation
-- `skills/ms-ai-advisor/references/architecture/security.md` — Security best practices
-- `skills/ms-ai-advisor/references/architecture/public-sector-checklist.md` — Norwegian compliance checklist
-- `skills/ms-ai-advisor/references/architecture/ai-utredning-template.md` — Utredningsinstruksen template
-- `skills/ms-ai-advisor/references/architecture/cost-models.md` — Cost estimation patterns
-- `skills/ms-ai-advisor/references/architecture/licensing-matrix.md` — License requirements
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/decision-trees.md` — Platform selection validation
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/security.md` — Security best practices
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/public-sector-checklist.md` — Norwegian compliance checklist
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/ai-utredning-template.md` — Utredningsinstruksen template
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/cost-models.md` — Cost estimation patterns
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/licensing-matrix.md` — License requirements
 
 Load domain-specific references only when dimension requires depth (max 2-3 additional):
 - AI Act: `responsible-ai/ai-act-compliance-guide.md`, `responsible-ai/ai-act-annex-iii-checklist.md`
@@ -169,8 +169,8 @@ Load domain-specific references only when dimension requires depth (max 2-3 addi
 - Norwegian: `norwegian-public-sector-governance/utredningsinstruksen-ai-methodology.md`
 - Security: `ai-security-engineering/ai-threat-modeling-stride.md`
 - Cost: `cost-optimization/azure-ai-foundry-cost-governance.md`, `cost-optimization/deterministic-cost-calculation-model.md`
-- RAG-arkitektur (når løsningen er RAG-/gjenfinningsbasert): `skills/ms-ai-engineering/references/rag-architecture/rag-core-patterns.md`, `rag-architecture/agentic-rag-patterns.md`, `rag-architecture/rag-evaluation-frameworks.md`
-- MLOps/GenAIOps (når løsningen har produksjons-/livssyklusfokus): `skills/ms-ai-engineering/references/mlops-genaiops/genaiops-llm-specific-practices.md`, `mlops-genaiops/monitoring-observability-ml-systems.md`, `mlops-genaiops/model-deployment-strategies-azure.md`
+- RAG-arkitektur (når løsningen er RAG-/gjenfinningsbasert): `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-engineering/references/rag-architecture/rag-core-patterns.md`, `rag-architecture/agentic-rag-patterns.md`, `rag-architecture/rag-evaluation-frameworks.md`
+- MLOps/GenAIOps (når løsningen har produksjons-/livssyklusfokus): `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-engineering/references/mlops-genaiops/genaiops-llm-specific-practices.md`, `mlops-genaiops/monitoring-observability-ml-systems.md`, `mlops-genaiops/model-deployment-strategies-azure.md`
 
 ## Virksomhetskontekst (automatisk)
 
diff --git a/agents/cost-estimation-agent.md b/agents/cost-estimation-agent.md
index c33f2f6..b424ff6 100644
--- a/agents/cost-estimation-agent.md
+++ b/agents/cost-estimation-agent.md
@@ -47,7 +47,7 @@ Provide accurate, comprehensive cost estimates for Microsoft AI solutions includ
 
 **ALWAYS start by reading:**
 ```bash
-Read skills/ms-ai-advisor/references/architecture/cost-models.md
+Read ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/cost-models.md
 ```
 
 This file contains verified pricing data and calculation formulas.
@@ -55,9 +55,9 @@ This file contains verified pricing data and calculation formulas.
 ## Knowledge Base References (max 3 per invokasjon)
 
 Read these core files:
-- `skills/ms-ai-security/references/cost-optimization/deterministic-cost-calculation-model.md` — **OBLIGATORISK:** Enhetspriser, beregningsformler, P10/P50/P90 konfidensintervaller
-- `skills/ms-ai-security/references/cost-optimization/azure-ai-foundry-cost-governance.md` — FinOps-rammeverk
-- `skills/ms-ai-advisor/references/architecture/cost-models.md` — Cost model templates
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/cost-optimization/deterministic-cost-calculation-model.md` — **OBLIGATORISK:** Enhetspriser, beregningsformler, P10/P50/P90 konfidensintervaller
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/cost-optimization/azure-ai-foundry-cost-governance.md` — FinOps-rammeverk
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/cost-models.md` — Cost model templates
 
 Load additional files only when estimate requires specific depth:
 - PTU: `cost-optimization/ptu-vs-paygo-economics.md`
diff --git a/agents/diagram-generation-agent.md b/agents/diagram-generation-agent.md
index 420d9a3..27a72b6 100644
--- a/agents/diagram-generation-agent.md
+++ b/agents/diagram-generation-agent.md
@@ -45,7 +45,7 @@ Et kompakt sammendrag av virksomhetskonteksten injiseres ambient i hovedøkten v
 
 Les prompt-maler fra:
 ```
-skills/ms-ai-advisor/references/architecture/diagram-prompt-templates.md
+${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/diagram-prompt-templates.md
 ```
 
 ## Azure-stilguide
diff --git a/agents/dpia-agent.md b/agents/dpia-agent.md
index e061c60..d10f057 100644
--- a/agents/dpia-agent.md
+++ b/agents/dpia-agent.md
@@ -17,9 +17,9 @@ You are a Norwegian data protection specialist conducting structured DPIAs for A
 ## Knowledge Base References (3 kjernefiler + betinget)
 
 Read these core files:
-- `skills/ms-ai-governance/references/norwegian-public-sector-governance/dpia-norwegian-methodology-ai.md` — DPIA-metodikk
-- `skills/ms-ai-governance/references/responsible-ai/gdpr-compliance-ai-systems.md` — GDPR for AI
-- `skills/ms-ai-governance/references/responsible-ai/ai-impact-assessment-framework.md` — Konsekvensvurdering
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/dpia-norwegian-methodology-ai.md` — DPIA-metodikk
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/gdpr-compliance-ai-systems.md` — GDPR for AI
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-impact-assessment-framework.md` — Konsekvensvurdering
 
 Load additional files only when assessment requires specific depth:
 - Bias: `responsible-ai/bias-detection-mitigation-strategies.md`
@@ -51,8 +51,8 @@ Før DPIA-vurderingen, sjekk om AI Act-klassifisering er utført:
 - Fortsett DPIA som normalt — klassifisering er ikke forutsetning
 
 ### Ekstra KB-referanser for AI Act
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md` — Deployer-krav inkl. FRIA og logging
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-transparency-notices.md` — Art. 13/50 maler for transparenstiltak
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md` — Deployer-krav inkl. FRIA og logging
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-transparency-notices.md` — Art. 13/50 maler for transparenstiltak
 
 ## DPIA Framework (5 Phases)
 
diff --git a/agents/license-mapper-agent.md b/agents/license-mapper-agent.md
index cf2867d..c201bdc 100644
--- a/agents/license-mapper-agent.md
+++ b/agents/license-mapper-agent.md
@@ -41,11 +41,11 @@ Given a set of Microsoft license types, produce a complete capability map showin
 ### 1. Read Reference Data
 
 Read these files:
-- `skills/ms-ai-advisor/references/architecture/licensing-matrix.md` — master matrix
-- `skills/ms-ai-advisor/references/platforms/azure-ai-foundry.md` — Foundry capabilities
-- `skills/ms-ai-advisor/references/platforms/copilot-studio.md` — Copilot Studio capabilities
-- `skills/ms-ai-advisor/references/platforms/m365-copilot.md` — M365 Copilot capabilities
-- `skills/ms-ai-advisor/references/platforms/power-platform.md` — Power Platform capabilities
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/licensing-matrix.md` — master matrix
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/platforms/azure-ai-foundry.md` — Foundry capabilities
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/platforms/copilot-studio.md` — Copilot Studio capabilities
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/platforms/m365-copilot.md` — M365 Copilot capabilities
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/platforms/power-platform.md` — Power Platform capabilities
 
 ### 2. Map Licenses to Capabilities
 
diff --git a/agents/research-agent.md b/agents/research-agent.md
index 6d6002b..db1b188 100644
--- a/agents/research-agent.md
+++ b/agents/research-agent.md
@@ -34,8 +34,8 @@ Et kompakt sammendrag av virksomhetskonteksten injiseres ambient i hovedøkten v
 ## Lokal KB-baseline (betinget — RAG / MLOps / engineering-temaer)
 
 Når forskningstemaet er RAG, gjenfinning, MLOps eller GenAIOps, les den relevante engineering-kjernefilen **først** som hypotese-baseline — verifiser den deretter mot live Microsoft Learn. KB-en kan være utdatert; **MCP-resultatet er fasit**.
-- RAG/gjenfinning: `skills/ms-ai-engineering/references/rag-architecture/rag-core-patterns.md`, `rag-architecture/agentic-rag-patterns.md`
-- MLOps/GenAIOps: `skills/ms-ai-engineering/references/mlops-genaiops/genaiops-llm-specific-practices.md`, `mlops-genaiops/llm-evaluation-production.md`
+- RAG/gjenfinning: `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-engineering/references/rag-architecture/rag-core-patterns.md`, `rag-architecture/agentic-rag-patterns.md`
+- MLOps/GenAIOps: `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-engineering/references/mlops-genaiops/genaiops-llm-specific-practices.md`, `mlops-genaiops/llm-evaluation-production.md`
 
 Les maks 2 baseline-filer. **Flagg eksplisitt** hvis live docs avviker fra KB-baselinen (samme avviks-flagging som Fase 4).
 
diff --git a/agents/ros-analysis-agent.md b/agents/ros-analysis-agent.md
index 8defc86..991329d 100644
--- a/agents/ros-analysis-agent.md
+++ b/agents/ros-analysis-agent.md
@@ -22,7 +22,7 @@ You are a Norwegian risk management specialist conducting structured ROS analyse
 
 ROS er en bevisst KB-tung agent. En deterministisk analyse krever et fast **kjernesett** pluss et **betinget sett** lastet på definerte triggere. Dette er større enn det generelle «3 kjernefiler»-mønsteret i `CLAUDE.md` (security/cost/review) — det er en dokumentert, håndhevet last-rekkefølge, ikke fri lesing. **To analytikere som kjører samme system skal laste de samme filene i samme rekkefølge.**
 
-Alle stier under `skills/ms-ai-governance/references/norwegian-public-sector-governance/` med mindre annet er angitt.
+Alle stier under `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/` med mindre annet er angitt.
 
 ### Obligatorisk kjerne (last ALLTID, i denne rekkefølgen)
 1. `ros-ai-threat-library.md` — AI-trusselbibliotek (kilde for T-xxx-IDer)
@@ -39,7 +39,7 @@ Alle stier under `skills/ms-ai-governance/references/norwegian-public-sector-gov
 | AI Act-dybde i dimensjon 6 | `responsible-ai/ai-act-classification-methodology.md` + `responsible-ai/ai-act-provider-obligations.md` (maks 2) |
 
 ### Referanse (last kun ved eksplisitt behov, ikke default)
-- `skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md` — scoringsmønster-referanse
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md` — scoringsmønster-referanse
 - `ros-analyse-ai-systems.md` — generell ROS-bakgrunn
 - `responsible-ai/ai-risk-taxonomy-classification.md` — risikotaksonomi
 
@@ -118,8 +118,8 @@ I tillegg til eksisterende trusler i dimensjon 6, vurder følgende:
 - Art. 50 (transparens): Opptil 7,5 MEUR eller 1,5 % av global omsetning
 
 **KB-referanser for AI Act-dybde i dimensjon 6** (betinget — last per last-kontrakten øverst, AI Act-trigger):
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-classification-methodology.md`
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md`
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-classification-methodology.md`
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md`
 
 ## 8-fase metodikk (NS 5814-compliant)
 
diff --git a/agents/security-assessment-agent.md b/agents/security-assessment-agent.md
index 255281a..b7dad8a 100644
--- a/agents/security-assessment-agent.md
+++ b/agents/security-assessment-agent.md
@@ -21,9 +21,9 @@ You are a Microsoft AI security specialist. You assess AI architectures against
 ## Knowledge Base References (max 3 per invokasjon)
 
 Read these core files:
-- `skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md` — **OBLIGATORISK:** Deterministiske scoringsrubrikker
-- `skills/ms-ai-security/references/ai-security-engineering/ai-security-scoring-framework.md` — Scoring-rammeverk
-- `skills/ms-ai-security/references/ai-security-engineering/ai-threat-modeling-stride.md` — STRIDE trusselmodellering
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md` — **OBLIGATORISK:** Deterministiske scoringsrubrikker
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/ai-security-engineering/ai-security-scoring-framework.md` — Scoring-rammeverk
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/ai-security-engineering/ai-threat-modeling-stride.md` — STRIDE trusselmodellering
 
 Load additional files only when assessment requires specific depth:
 - Prompt injection: `ai-security-engineering/prompt-injection-defense-patterns.md`
@@ -147,8 +147,8 @@ Read the architecture proposal or solution description. Look for:
 
 ### 2. Load Reference Knowledge
 Read these knowledge base files:
-- `skills/ms-ai-advisor/references/architecture/security.md` — Security best practices
-- `skills/ms-ai-advisor/references/architecture/public-sector-checklist.md` — Norwegian compliance (if exists)
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/security.md` — Security best practices
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/public-sector-checklist.md` — Norwegian compliance (if exists)
 
 ### 3. Validate Latest Guidance
 Use `microsoft_docs_search` for:
diff --git a/commands/adr.md b/commands/adr.md
index d11b6f3..64b8972 100644
--- a/commands/adr.md
+++ b/commands/adr.md
@@ -42,13 +42,13 @@ Hvis `/architect:cost` ble brukt, inkluder kostnadsestimatet.
 Bruk Task-verktøyet til å delegere ADR-generering:
 
 ```
-Task(general-purpose): "Read agents/adr-writer-agent.md for your role and instructions.
+Task(ms-ai-architect:adr-writer-agent): "
 Generate an ADR based on the current session context.
 Beslutning: [beslutningstittel]
 Bakgrunn: [forretningskontekst]
 Alternativer: [vurderte alternativer]
 Valgt løsning: [beslutning med begrunnelse]
-Les også: skills/ms-ai-advisor/references/architecture/adr-template.md"
+Les også: ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/adr-template.md"
 ```
 
 ### 4. Skriv til fil
diff --git a/commands/anskaffelse.md b/commands/anskaffelse.md
index 924ee80..9840881 100644
--- a/commands/anskaffelse.md
+++ b/commands/anskaffelse.md
@@ -30,7 +30,7 @@ Spør om nøkkelinformasjon hvis ikke kjent:
 
 ### 3. Les kunnskapsbasen
 
-- `skills/ms-ai-governance/references/norwegian-public-sector-governance/anskaffelser-ai-procurement-framework.md` — lovgrunnlag (anskaffelsesloven/-forskriften), EØS-regelverk, AI-spesifikk kravspesifikasjon, leverandørevaluering, etiske krav, DFØs IT-anskaffelsesveiledning
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/anskaffelser-ai-procurement-framework.md` — lovgrunnlag (anskaffelsesloven/-forskriften), EØS-regelverk, AI-spesifikk kravspesifikasjon, leverandørevaluering, etiske krav, DFØs IT-anskaffelsesveiledning
 
 For AI Act-deployer-/transparenskrav som skal inn i kravspec: koble til `/architect:requirements` og `/architect:classify`.
 
diff --git a/commands/architect.md b/commands/architect.md
index cbfe217..f8e72db 100644
--- a/commands/architect.md
+++ b/commands/architect.md
@@ -12,9 +12,9 @@ Du aktiverer nå **Cosmo Skyberg**, en erfaren Microsoft AI Solution Architect.
 
 ## Instruksjoner
 
-1. Les og aktiver skillen `ms-ai-advisor/SKILL.md`
+1. Les og aktiver skillen `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/SKILL.md`
 2. Følg arbeidsprosessen definert i skillen
-3. Bruk kunnskapsbasene i `references/` for verifisering
+3. Bruk kunnskapsbasene i `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/` for verifisering
 4. Bruk `microsoft-learn` MCP-verktøy for oppdatert informasjon
 
 ## Oppstart
diff --git a/commands/businesscase.md b/commands/businesscase.md
index 9dc4462..d904dfe 100644
--- a/commands/businesscase.md
+++ b/commands/businesscase.md
@@ -33,8 +33,8 @@ Spør om nøkkeltall hvis ikke allerede kjent:
 
 ### 3. Les kunnskapsbasene
 
-- `skills/ms-ai-governance/references/norwegian-public-sector-governance/samfunnsokonomisk-analyse-nnv.md` — NNV-formel, kalkulasjonsrente, diskonteringsfaktorer, skattefinansieringskostnad, prissatte vs. ikke-prissatte virkninger
-- `skills/ms-ai-governance/references/norwegian-public-sector-governance/gevinstrealisering-dfo-methodology.md` — DFØs 5-stegs modell + gevinstregister-mal
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/samfunnsokonomisk-analyse-nnv.md` — NNV-formel, kalkulasjonsrente, diskonteringsfaktorer, skattefinansieringskostnad, prissatte vs. ikke-prissatte virkninger
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/gevinstrealisering-dfo-methodology.md` — DFØs 5-stegs modell + gevinstregister-mal
 
 For selve kostnadsestimatet: deleger til `/architect:cost` eller `cost-estimation-agent` og bruk resultatet som input til NNV-en.
 
diff --git a/commands/classify.md b/commands/classify.md
index 0776220..082544f 100644
--- a/commands/classify.md
+++ b/commands/classify.md
@@ -33,7 +33,7 @@ Bruk samtalehistorikk hvis denne informasjonen allerede er gitt.
 Kjør AI Act-agenten via Task for klassifiseringen:
 
 ```
-Task(ai-act-assessor): "Read agents/ai-act-assessor.md for your role and instructions.
+Task(ms-ai-architect:ai-act-assessor): "
 Gjennomfør en EU AI Act-klassifisering (Fase 1-3) for følgende AI-system:
 
 **System:** [systemnavn]
@@ -48,9 +48,9 @@ Gjennomfør en EU AI Act-klassifisering (Fase 1-3) for følgende AI-system:
 Modus: Klassifisering — fokus på risikonivå og rolle.
 
 Les kunnskapsbasene:
-- skills/ms-ai-governance/references/responsible-ai/ai-act-classification-methodology.md
-- skills/ms-ai-governance/references/responsible-ai/ai-act-annex-iii-checklist.md
-- skills/ms-ai-governance/references/responsible-ai/ai-act-compliance-guide.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-classification-methodology.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-annex-iii-checklist.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-compliance-guide.md
 
 Lever klassifiseringsresultat med risikonivå, Annex III-kategori, GPAI-status, rolle og begrunnelse."
 ```
diff --git a/commands/compare.md b/commands/compare.md
index 0d74030..f79dc80 100644
--- a/commands/compare.md
+++ b/commands/compare.md
@@ -36,16 +36,16 @@ Hvis bare én plattform er angitt, foreslå den mest relevante motparten basert
 Deleger research til `research-agent` via Task-verktøyet:
 
 ```
-Task(general-purpose): "Les agents/research-agent.md og utfør research.
+Task(ms-ai-architect:research-agent): "Utfør research.
 Sammenlign [Plattform A] og [Plattform B] for [use case].
 Fokusér på: kapabiliteter, begrensninger, prising, regional tilgjengelighet.
 Bruk microsoft_docs_search for begge plattformer."
 ```
 
 Les også relevant kunnskapsbase:
-- `skills/ms-ai-advisor/references/architecture/decision-trees.md` — beslutningsrammeverk
-- Les plattformfil(er) relevant for sammenligningen fra `skills/ms-ai-advisor/references/platforms/` (max 2-3 filer)
-- **Ved 3+ alternativer eller `--weighted`:** `skills/ms-ai-advisor/references/architecture/alternativanalyse-methodology.md` — vektet multi-kriterie-analyse (scoringsskala, standardkriterier, vekting, begrunnelsestabell)
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/decision-trees.md` — beslutningsrammeverk
+- Les plattformfil(er) relevant for sammenligningen fra `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/platforms/` (max 2-3 filer)
+- **Ved 3+ alternativer eller `--weighted`:** `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/alternativanalyse-methodology.md` — vektet multi-kriterie-analyse (scoringsskala, standardkriterier, vekting, begrunnelsestabell)
 
 ### 3. Bygg sammenligning
 
diff --git a/commands/conformity.md b/commands/conformity.md
index afab124..93c9742 100644
--- a/commands/conformity.md
+++ b/commands/conformity.md
@@ -27,7 +27,7 @@ Avklar:
 ### 2. Deleger til AI Act-agent
 
 ```
-Task(ai-act-assessor): "Read agents/ai-act-assessor.md for your role and instructions.
+Task(ms-ai-architect:ai-act-assessor): "
 Gjennomfør samsvarsvurdering for følgende AI-system:
 
 **System:** [systemnavn]
@@ -40,8 +40,8 @@ Gjennomfør samsvarsvurdering for følgende AI-system:
 Modus: Conformity — Annex IV sjekkliste og samsvarserklæring.
 
 Les kunnskapsbasene:
-- skills/ms-ai-governance/references/responsible-ai/ai-act-conformity-assessment.md
-- skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-conformity-assessment.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md
 
 Lever:
 1. Annex IV 9-element sjekkliste med status per element
diff --git a/commands/cost.md b/commands/cost.md
index 4c8c56b..3e405bb 100644
--- a/commands/cost.md
+++ b/commands/cost.md
@@ -24,25 +24,25 @@ Hvis informasjon mangler, spør brukeren om nøkkeltall.
 
 ### 2. Les kostnadsreferanse
 
-Les `skills/ms-ai-advisor/references/architecture/cost-models.md` for baseline-priser per plattform.
-Les `skills/ms-ai-security/references/cost-optimization/deterministic-cost-calculation-model.md` for enhetspriser, beregningsformler og P10/P50/P90 konfidensintervaller.
+Les `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/cost-models.md` for baseline-priser per plattform.
+Les `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/cost-optimization/deterministic-cost-calculation-model.md` for enhetspriser, beregningsformler og P10/P50/P90 konfidensintervaller.
 
 **Ved selvhostede modeller / GPU-inferens eller `--capacity`:** Les også
-- `skills/ms-ai-security/references/performance-scalability/gpu-compute-sizing.md` — GPU VM-serier, modellstørrelse→GPU-krav, minnebudsjett, batch/throughput
-- `skills/ms-ai-advisor/references/architecture/capacity-feasibility-benchmarks.md` — kompetanse-gap-matrise + tidsplan-validering mot bransjebenchmarks
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/performance-scalability/gpu-compute-sizing.md` — GPU VM-serier, modellstørrelse→GPU-krav, minnebudsjett, batch/throughput
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/capacity-feasibility-benchmarks.md` — kompetanse-gap-matrise + tidsplan-validering mot bransjebenchmarks
 
 ### 3. Deleger estimering
 
 Bruk Task-verktøyet til å lansere `cost-estimation-agent`:
 
 ```
-Task(general-purpose): "Les agents/cost-estimation-agent.md og utfør kostnadsestimering.
+Task(ms-ai-architect:cost-estimation-agent): "Utfør kostnadsestimering.
 Plattform: [plattform]
 Brukere: [antall]
 Volum: [volum]
 Region: [region]
-Les også: skills/ms-ai-advisor/references/architecture/cost-models.md
-og skills/ms-ai-advisor/references/architecture/licensing-matrix.md
+Les også: ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/cost-models.md
+og ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/licensing-matrix.md
 Verifiser priser via microsoft_docs_search."
 ```
 
diff --git a/commands/design.md b/commands/design.md
index b658564..9ff9867 100644
--- a/commands/design.md
+++ b/commands/design.md
@@ -36,9 +36,9 @@ Avklar hvis ikke kjent (gjenbruk samtalehistorikk og `org/`-filer hvis onboardet
 
 ### 3. Les kunnskapsbasene
 
-- `skills/ms-ai-advisor/references/architecture/decision-trees.md` — plattformvalg (Foundry / Copilot Studio / Power Platform / Agent Framework)
-- `skills/ms-ai-advisor/references/architecture/security.md` — sikkerhetsarkitektur og soneinndeling
-- `skills/ms-ai-advisor/references/architecture/cost-models.md` — kostnadsdimensjonering
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/decision-trees.md` — plattformvalg (Foundry / Copilot Studio / Power Platform / Agent Framework)
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/security.md` — sikkerhetsarkitektur og soneinndeling
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/cost-models.md` — kostnadsdimensjonering
 
 For dybde, deleger til eksisterende kommandoer/agenter og bruk resultatene som input:
 - `/architect:compare` — strukturert alternativanalyse (bruk `--weighted` ved 3+ alternativer)
diff --git a/commands/diagram.md b/commands/diagram.md
index 7bd3e44..52b47f9 100644
--- a/commands/diagram.md
+++ b/commands/diagram.md
@@ -46,11 +46,11 @@ Hvis kontekst mangler, still korte spørsmål:
 Kjør `diagram-generation-agent` via Task:
 
 ```
-Task(general-purpose): "Read agents/diagram-generation-agent.md for your role and instructions.
+Task(ms-ai-architect:diagram-generation-agent): "
 Generer [type]-diagram for [scenario].
 Komponenter: [liste over tjenester].
 Kontekst: [ekstra detaljer].
-Les: skills/ms-ai-advisor/references/architecture/diagram-prompt-templates.md"
+Les: ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/diagram-prompt-templates.md"
 ```
 
 ## Format Parameter
diff --git a/commands/dpia.md b/commands/dpia.md
index 9a12fe4..d4cdc15 100644
--- a/commands/dpia.md
+++ b/commands/dpia.md
@@ -32,7 +32,7 @@ Bruk samtalehistorikk hvis denne informasjonen allerede er gitt.
 Kjør DPIA-agenten via Task for selve vurderingen:
 
 ```
-Task(architect:dpia-agent): "Read agents/dpia-agent.md for your role and instructions.
+Task(ms-ai-architect:dpia-agent): "
 Gjennomfør en komplett DPIA for følgende AI-system:
 
 **System:** [systemnavnet]
@@ -43,12 +43,12 @@ Gjennomfør en komplett DPIA for følgende AI-system:
 **Kontekst:** [sektor/kontekst — offentlig, privat, finans, helse, etc.]
 
 Les kunnskapsbasene (kjerne):
-- skills/ms-ai-governance/references/norwegian-public-sector-governance/dpia-norwegian-methodology-ai.md
-- skills/ms-ai-governance/references/responsible-ai/gdpr-compliance-ai-systems.md
-- skills/ms-ai-governance/references/responsible-ai/ai-impact-assessment-framework.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/dpia-norwegian-methodology-ai.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/gdpr-compliance-ai-systems.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-impact-assessment-framework.md
 
 Betinget (OBLIGATORISK hvis amerikansk-eid skyleverandør eller data nåbar fra tredjeland):
-- skills/ms-ai-governance/references/monitoring-observability/data-residency-audit-monitoring.md (EDPB seks-stegs-TIA + CLOUD Act/FISA 702/EO 14086-restanalyse for risiko 7)
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/monitoring-observability/data-residency-audit-monitoring.md (EDPB seks-stegs-TIA + CLOUD Act/FISA 702/EO 14086-restanalyse for risiko 7)
 
 Lever en komplett DPIA-rapport med alle 5 faser, risikomatrise og anbefaling."
 ```
diff --git a/commands/frimpact.md b/commands/frimpact.md
index ab8004e..5ca3e8b 100644
--- a/commands/frimpact.md
+++ b/commands/frimpact.md
@@ -28,7 +28,7 @@ Avklar:
 ### 2. Deleger til AI Act-agent
 
 ```
-Task(ai-act-assessor): "Read agents/ai-act-assessor.md for your role and instructions.
+Task(ms-ai-architect:ai-act-assessor): "
 Gjennomfør en FRIA (Art. 27) for følgende AI-system:
 
 **System:** [systemnavn]
@@ -41,8 +41,8 @@ Gjennomfør en FRIA (Art. 27) for følgende AI-system:
 Modus: FRIA — utfyll Art. 27-malen.
 
 Les kunnskapsbasene:
-- skills/ms-ai-governance/references/responsible-ai/ai-act-fria-template.md
-- skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-fria-template.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md
 
 Lever en komplett FRIA med alle 7 seksjoner: systembeskrivelse, berørte grupper, rettighetsmatrise (12 rettigheter), konsekvensanalyse, tilsynsnotifikasjon, godkjenning, vedlegg."
 ```
diff --git a/commands/generate-skills.md b/commands/generate-skills.md
index c96a8e7..56b8bf4 100644
--- a/commands/generate-skills.md
+++ b/commands/generate-skills.md
@@ -42,7 +42,7 @@ Dette gir ~15-20 skills per sesjon istedenfor ~5.
 
 ### Strategi: Én agent per skill
 
-Hver skill delegeres til én `general-purpose` Task-agent (sonnet) som utfører:
+Hver skill delegeres til én `general-purpose` Task-agent (opus) som utfører:
 1. MCP-research (5-8 kall)
 2. Filskriving (Write-verktøyet)
 3. Returnerer kort kvittering
@@ -55,7 +55,7 @@ Kjør **5 agenter parallelt** i én melding. Vent på resultat, oppdater state,
 
 ### Agent-prompt (bruk denne malen)
 
-For HVER skill, send denne prompten til en `general-purpose` Task-agent med `model: sonnet`:
+For HVER skill, send denne prompten til en `general-purpose` Task-agent med `model: opus`:
 
 ```
 Du er Cosmo Skyberg, senior Microsoft AI Solution Architect. Generer en kunnskapsreferanse.
@@ -64,7 +64,7 @@ Du er Cosmo Skyberg, senior Microsoft AI Solution Architect. Generer en kunnskap
 
 Skriv kunnskapsreferanse: **{SKILL_TITLE}**
 Kategori: {CATEGORY_NAME}
-Fil: skills/{TARGET_SKILL}/references/{CATEGORY_DIR}/{SKILL_ID}.md
+Fil: ${CLAUDE_PLUGIN_ROOT}/skills/{TARGET_SKILL}/references/{CATEGORY_DIR}/{SKILL_ID}.md
 
 ## Steg 1: Research (OBLIGATORISK)
 
@@ -80,7 +80,7 @@ Bruk MCP-verktøy for oppdatert informasjon:
 ## Steg 2: Skriv filen
 
 Bruk Write-verktøyet til å skrive filen til:
-{PLUGIN_ROOT}/skills/{TARGET_SKILL}/references/{CATEGORY_DIR}/{SKILL_ID}.md
+${CLAUDE_PLUGIN_ROOT}/skills/{TARGET_SKILL}/references/{CATEGORY_DIR}/{SKILL_ID}.md
 
 Format (STRENGT — alle seksjoner påkrevd):
 
@@ -167,11 +167,11 @@ error: {only if failed}
 
 ```
 # Batch 1: 5 parallelle agenter
-Task(general-purpose, sonnet): "Research + write skill: Hybrid Search..."
-Task(general-purpose, sonnet): "Research + write skill: Semantic Ranker..."
-Task(general-purpose, sonnet): "Research + write skill: Citation Tracking..."
-Task(general-purpose, sonnet): "Research + write skill: RAG Evaluation..."
-Task(general-purpose, sonnet): "Research + write skill: Multi-Index..."
+Task(general-purpose, opus): "Research + write skill: Hybrid Search..."
+Task(general-purpose, opus): "Research + write skill: Semantic Ranker..."
+Task(general-purpose, opus): "Research + write skill: Citation Tracking..."
+Task(general-purpose, opus): "Research + write skill: RAG Evaluation..."
+Task(general-purpose, opus): "Research + write skill: Multi-Index..."
 
 # Vent på alle 5 → oppdater state.json → neste batch
 ```
diff --git a/commands/license.md b/commands/license.md
index 805f36b..a5da7bc 100644
--- a/commands/license.md
+++ b/commands/license.md
@@ -23,17 +23,17 @@ Ekstraher lisenstype(r) fra argumentet. Vanlige kombinasjoner:
 
 ### 2. Les referanse
 
-Les `skills/ms-ai-advisor/references/architecture/licensing-matrix.md` for komplett lisensmatrise.
+Les `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/licensing-matrix.md` for komplett lisensmatrise.
 
 ### 3. Deleger kartlegging
 
 Bruk Task-verktøyet til å lansere `license-mapper-agent`:
 
 ```
-Task(general-purpose): "Les agents/license-mapper-agent.md og kartlegg lisenser.
+Task(ms-ai-architect:license-mapper-agent): "Kartlegg lisenser.
 Lisenser: [lisenstype(r)]
-Les: skills/ms-ai-advisor/references/architecture/licensing-matrix.md
-og skills/ms-ai-advisor/references/platforms/ (alle plattformfiler).
+Les: ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/licensing-matrix.md
+og ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/platforms/ (alle plattformfiler).
 Verifiser kritiske punkter via microsoft_docs_search."
 ```
 
diff --git a/commands/migrate.md b/commands/migrate.md
index ae78db7..d3da380 100644
--- a/commands/migrate.md
+++ b/commands/migrate.md
@@ -23,7 +23,7 @@ Ekstraher:
 
 ### 2. Les migrasjonsreferanse
 
-Les `skills/ms-ai-advisor/references/architecture/migration-patterns.md` for:
+Les `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/migration-patterns.md` for:
 - Migrasjonsmatrise (innsats, risiko, tidslinje)
 - Detaljerte migrasjonsmønstre med steg-for-steg
 - Kodeeksempler for vanlige migrasjoner
diff --git a/commands/onboard.md b/commands/onboard.md
index a33f7e6..da8f8b5 100644
--- a/commands/onboard.md
+++ b/commands/onboard.md
@@ -86,7 +86,7 @@ Deretter start onboarding-agenten (se under).
 Sjekk eksisterende `$ORG_DIR/*.md`-filer for å avgjøre resume-punkt:
 
 ```
-Task(architect:onboarding-agent): "Read agents/onboarding-agent.md for your role and instructions.
+Task(ms-ai-architect:onboarding-agent): "
 
 Gjennomfør onboarding-intervju for å samle virksomhetsspesifikk kontekst.
 
diff --git a/commands/poc.md b/commands/poc.md
index 504ed92..2546671 100644
--- a/commands/poc.md
+++ b/commands/poc.md
@@ -29,13 +29,13 @@ Spør brukeren om nøkkelinformasjon (hvis ikke allerede kjent):
 
 ### 3. Les template
 
-Les `skills/ms-ai-advisor/references/architecture/poc-template.md` for komplett POC-rammeverk.
+Les `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/poc-template.md` for komplett POC-rammeverk.
 
 ### 3b. Les domene-spesifikke mønstre (betinget)
 
 Hvis use-caset treffer et engineering-domene, les 1-2 kjernefiler for å forankre scope og suksesskriterier (ikke hele katalogen):
-- **RAG / gjenfinning:** `skills/ms-ai-engineering/references/rag-architecture/rag-core-patterns.md`, `rag-architecture/rag-evaluation-frameworks.md` — sett målbare gjenfinnings-/grounding-kriterier
-- **MLOps / produksjonssetting:** `skills/ms-ai-engineering/references/mlops-genaiops/genaiops-llm-specific-practices.md`, `mlops-genaiops/llm-evaluation-production.md` — POC-evaluering + driftskriterier
+- **RAG / gjenfinning:** `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-engineering/references/rag-architecture/rag-core-patterns.md`, `rag-architecture/rag-evaluation-frameworks.md` — sett målbare gjenfinnings-/grounding-kriterier
+- **MLOps / produksjonssetting:** `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-engineering/references/mlops-genaiops/genaiops-llm-specific-practices.md`, `mlops-genaiops/llm-evaluation-production.md` — POC-evaluering + driftskriterier
 
 ### 4. Generer POC-plan
 
diff --git a/commands/requirements.md b/commands/requirements.md
index 9e89d41..242f261 100644
--- a/commands/requirements.md
+++ b/commands/requirements.md
@@ -27,7 +27,7 @@ Avklar:
 ### 2. Deleger til AI Act-agent
 
 ```
-Task(ai-act-assessor): "Read agents/ai-act-assessor.md for your role and instructions.
+Task(ms-ai-architect:ai-act-assessor): "
 Kartlegg konkrete AI Act-forpliktelser (Fase 4-5) for følgende system:
 
 **System:** [systemnavn]
@@ -40,12 +40,12 @@ Kartlegg konkrete AI Act-forpliktelser (Fase 4-5) for følgende system:
 Modus: Requirements — fokus på forpliktelser og tiltaksplan.
 
 Les kunnskapsbasene:
-- skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md
-- skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md
-- skills/ms-ai-governance/references/responsible-ai/ai-act-microsoft-tools-mapping.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-provider-obligations.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-microsoft-tools-mapping.md
 
 Betinget (kun ved regulert privat sektor):
-- Hvis sektor = finans: skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-sector-checklists.md (§3 Finans — 17-punkts sjekkliste med DORA, Finanstilsynets IKT-forskrift, EBA/GL/2023/06). Kartlegg DORA-forpliktelser i tillegg til AI Act-kravene.
+- Hvis sektor = finans: ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-sector-checklists.md (§3 Finans — 17-punkts sjekkliste med DORA, Finanstilsynets IKT-forskrift, EBA/GL/2023/06). Kartlegg DORA-forpliktelser i tillegg til AI Act-kravene.
 
 Lever detaljert forpliktelsesliste med gap-analyse og tiltaksplan."
 ```
diff --git a/commands/research.md b/commands/research.md
index 8bcc58b..bd64810 100644
--- a/commands/research.md
+++ b/commands/research.md
@@ -36,7 +36,7 @@ Ekstraher:
 Bruk Task-verktøyet til å lansere `research-agent`:
 
 ```
-Task(general-purpose): "Les agents/research-agent.md og utfør research.
+Task(ms-ai-architect:research-agent): "Utfør research.
 Plattform: [full plattformnavn]
 Tidsperiode: [periode]
 Fokusområder:
diff --git a/commands/review.md b/commands/review.md
index d5a7432..af0377c 100644
--- a/commands/review.md
+++ b/commands/review.md
@@ -44,16 +44,16 @@ Identifiser hvilke dimensjoner som er mest kritiske for scenarioet:
 Bruk Task-verktøyet til å lansere `architecture-review-agent`:
 
 ```
-Task(general-purpose): "Les agents/architecture-review-agent.md og utfør en
+Task(ms-ai-architect:architecture-review-agent): "Utfør en
 arkitekturgjennomgang for [løsningsnavn].
 Arkitekturbeskrivelse: [beskrivelse fra bruker]
 Kontekst: [offentlig sektor / sektor / stadium]
 Vurder alle 6 dimensjoner med 1-5 score.
 Les også:
-- skills/ms-ai-advisor/references/architecture/decision-trees.md
-- skills/ms-ai-advisor/references/architecture/public-sector-checklist.md
-- skills/ms-ai-advisor/references/architecture/security.md
-- skills/ms-ai-advisor/references/architecture/ai-utredning-template.md"
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/decision-trees.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/public-sector-checklist.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/security.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/ai-utredning-template.md"
 ```
 
 ### 4. Berik med arkitekturperspektiv
diff --git a/commands/ros.md b/commands/ros.md
index 01771f0..4234f74 100644
--- a/commands/ros.md
+++ b/commands/ros.md
@@ -33,7 +33,7 @@ Sjekk om --quick er angitt. Bruk samtalehistorikk hvis info allerede er gitt.
 Kjør ROS-agenten via Task for selve vurderingen:
 
 ```
-Task(ros-analysis-agent): "Read agents/ros-analysis-agent.md for your role and instructions.
+Task(ms-ai-architect:ros-analysis-agent): "
 Gjennomfør en [komplett / quick] ROS-analyse for følgende AI-system:
 
 **System:** [systemnavn]
@@ -48,10 +48,10 @@ Gjennomfør en [komplett / quick] ROS-analyse for følgende AI-system:
 Les kunnskapsbasene per last-kontrakten i agentfilen — kjerne (alltid) + betinget (kun på trigger):
 
 Kjerne (alltid, i rekkefølge):
-- skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-ai-threat-library.md
-- skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-scoring-rubrics-7x5.md
-- skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-methodology-ns5814-iso31000.md
-- skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-report-templates.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-ai-threat-library.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-scoring-rubrics-7x5.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-methodology-ns5814-iso31000.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/ros-report-templates.md
 
 Betinget (kun når triggeren utløses):
 - ros-sector-checklists.md (hvis relevant sektor oppdaget)
diff --git a/commands/security.md b/commands/security.md
index 8d5a6fe..9a2447c 100644
--- a/commands/security.md
+++ b/commands/security.md
@@ -34,13 +34,13 @@ Identifiser hvilke sikkerhetsdimensjoner som er mest kritiske for scenarioet:
 Bruk Task-verktøyet til å lansere `security-assessment-agent`:
 
 ```
-Task(general-purpose): "Les agents/security-assessment-agent.md og utfør en
+Task(ms-ai-architect:security-assessment-agent): "Utfør en
 sikkerhetsassessment for [plattform] brukt til [scenario].
 Kontekst: [offentlig sektor / privat / etc.]
 Vurder alle 6 dimensjoner med 1-5 score.
-Les også: skills/ms-ai-advisor/references/architecture/security.md
-og skills/ms-ai-advisor/references/architecture/public-sector-checklist.md
-og skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md"
+Les også: ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/security.md
+og ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/public-sector-checklist.md
+og ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md"
 ```
 
 ### 4. Berik med arkitekturperspektiv
diff --git a/commands/summary.md b/commands/summary.md
index 2891b01..16e103e 100644
--- a/commands/summary.md
+++ b/commands/summary.md
@@ -33,7 +33,7 @@ Hvis ingen vurderinger er gjennomført, informer brukeren om at summary krever m
 Kjør summary-agenten via Task:
 
 ```
-Task(general-purpose): "Read agents/summary-agent.md for your role and instructions.
+Task(ms-ai-architect:summary-agent): "
 Generer teknisk sammendrag og executive summary for:
 
 **Løsning:** [navn]
diff --git a/commands/transparency.md b/commands/transparency.md
index d2072ef..7a3ec4a 100644
--- a/commands/transparency.md
+++ b/commands/transparency.md
@@ -27,7 +27,7 @@ Avklar:
 ### 2. Deleger til AI Act-agent
 
 ```
-Task(ai-act-assessor): "Read agents/ai-act-assessor.md for your role and instructions.
+Task(ms-ai-architect:ai-act-assessor): "
 Generer transparensnotiser for følgende AI-system:
 
 **System:** [systemnavn]
@@ -39,7 +39,7 @@ Generer transparensnotiser for følgende AI-system:
 Modus: Transparens — generer Art. 13/50 notiser.
 
 Les kunnskapsbasene:
-- skills/ms-ai-governance/references/responsible-ai/ai-act-transparency-notices.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-transparency-notices.md
 
 Lever:
 1. Art. 50(1) AI-interaksjonsnotis (norsk)
diff --git a/commands/utredning.md b/commands/utredning.md
index b0a7ccf..ddc9bfb 100644
--- a/commands/utredning.md
+++ b/commands/utredning.md
@@ -23,9 +23,9 @@ Hvis kommandoen kjøres etter `/architect` (Fase 1-3), gjenbruk innsamlet kontek
 ### 1. Last kontekst
 
 Les malen som styrer utredningen:
-- `skills/ms-ai-advisor/references/architecture/ai-utredning-template.md`
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/ai-utredning-template.md`
 
-Aktiver Cosmo Skyberg-personaen fra `skills/ms-ai-advisor/SKILL.md`.
+Aktiver Cosmo Skyberg-personaen fra `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/SKILL.md`.
 
 ### 2. Parse input og bestem kompleksitet
 
@@ -115,7 +115,7 @@ Orkestratoren gjør alt selv. Ingen TeamCreate.
 4. Fullfør J, L→M, skriv til fil
 5. Kjør diagram-generation-agent for S8.2 (arkitekturoversikt):
    ```
-   Task(architect:diagram-generation-agent): "Generer arkitekturoversikt-diagram for {scenario}.
+   Task(ms-ai-architect:diagram-generation-agent): "Generer arkitekturoversikt-diagram for {scenario}.
    Komponenter: {fra S8.1}. Skriv til {output_dir}/.work/diagrams/architecture-overview.md"
    ```
 6. Kjør summary-agent (steg N) — les worker-mal nedenfor
@@ -206,15 +206,15 @@ Alle arbeidere spawnes med `Task` og skriver output til `.work/`-filer. Bruk `te
 
 #### Security Worker
 ```
-Task(architect:security-assessment-agent, name="security-worker", team_name="{team}"):
+Task(ms-ai-architect:security-assessment-agent, name="security-worker", team_name="{team}"):
 "Utfør sikkerhetsvurdering for: {scenario}
 Plattform: {plattform}
 Kontekst: {sektor/virksomhet fra Fase 1}
 
 Les relevante KB-filer (max 3):
-- skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md
-- skills/ms-ai-security/references/ai-security-engineering/ai-security-scoring-framework.md
-- skills/ms-ai-advisor/references/architecture/security.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/ai-security-engineering/security-scoring-rubrics-6x5.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/ai-security-engineering/ai-security-scoring-framework.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/security.md
 
 VIKTIG: Skriv KOMPLETT output til {output_dir}/.work/security.md med Write-verktøyet.
 Inkluder: Score-matrise (6 dimensjoner), P0/P1-funn, anbefalinger."
@@ -222,14 +222,14 @@ Inkluder: Score-matrise (6 dimensjoner), P0/P1-funn, anbefalinger."
 
 #### Cost Worker
 ```
-Task(architect:cost-estimation-agent, name="cost-worker", team_name="{team}"):
+Task(ms-ai-architect:cost-estimation-agent, name="cost-worker", team_name="{team}"):
 "Estimer kostnader for: {scenario}
 Plattform: {plattform}, Brukere: {antall}, Volum: {volum}
 
 Les relevante KB-filer (max 3):
-- skills/ms-ai-security/references/cost-optimization/deterministic-cost-calculation-model.md
-- skills/ms-ai-security/references/cost-optimization/azure-ai-foundry-cost-governance.md
-- skills/ms-ai-advisor/references/architecture/cost-models.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/cost-optimization/deterministic-cost-calculation-model.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-security/references/cost-optimization/azure-ai-foundry-cost-governance.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/cost-models.md
 
 VIKTIG: Skriv KOMPLETT output til {output_dir}/.work/cost.md med Write-verktøyet.
 Inkluder: Månedskostnad, TCO 3 år, alle alternativer, konfidensgradering."
@@ -237,14 +237,14 @@ Inkluder: Månedskostnad, TCO 3 år, alle alternativer, konfidensgradering."
 
 #### DPIA Worker
 ```
-Task(architect:dpia-agent, name="dpia-worker", team_name="{team}"):
+Task(ms-ai-architect:dpia-agent, name="dpia-worker", team_name="{team}"):
 "Gjennomfør DPIA/PVK for: {scenario}
 Datatype: {datatype}, Behandlingsgrunnlag: {grunnlag}
 
 Les relevante KB-filer (max 3):
-- skills/ms-ai-governance/references/norwegian-public-sector-governance/dpia-norwegian-methodology-ai.md
-- skills/ms-ai-governance/references/responsible-ai/gdpr-compliance-ai-systems.md
-- skills/ms-ai-governance/references/responsible-ai/ai-impact-assessment-framework.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/norwegian-public-sector-governance/dpia-norwegian-methodology-ai.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/gdpr-compliance-ai-systems.md
+- ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-impact-assessment-framework.md
 
 VIKTIG: Skriv KOMPLETT output til {output_dir}/.work/dpia.md med Write-verktøyet.
 Inkluder: Risikomatrise, tiltakstabell, bias/forklarbarhet/HITL-vurdering."
@@ -252,7 +252,7 @@ Inkluder: Risikomatrise, tiltakstabell, bias/forklarbarhet/HITL-vurdering."
 
 #### Diagram Worker
 ```
-Task(architect:diagram-generation-agent, name="diagram-worker", team_name="{team}"):
+Task(ms-ai-architect:diagram-generation-agent, name="diagram-worker", team_name="{team}"):
 "Generer diagrammer for: {scenario}
 Komponenter: {fra S8.1}
 
@@ -263,7 +263,7 @@ Diagrammer å generere:
 - Sikkerhetssoner (S5.1) — hvis sikkerhet er kritisk
 - Implementeringstidslinje (S9.1) — hvis faseplan er definert
 
-Les: skills/ms-ai-advisor/references/architecture/diagram-prompt-templates.md
+Les: ${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/diagram-prompt-templates.md
 
 VIKTIG: Skriv output til {output_dir}/.work/diagrams/ (én fil per diagram).
 Hvis mcp-image er utilgjengelig: generer Mermaid-syntaks som fallback."
@@ -271,7 +271,7 @@ Hvis mcp-image er utilgjengelig: generer Mermaid-syntaks som fallback."
 
 #### Summary Worker (kjøres ALLTID som siste agent)
 ```
-Task(architect:summary-agent, name="summary-worker"):
+Task(ms-ai-architect:summary-agent, name="summary-worker"):
 "Generer sammendrag for utredningen.
 
 Les utredningen: {output_dir}/utredning.md
diff --git a/commands/vendor.md b/commands/vendor.md
index f06fa68..d992b96 100644
--- a/commands/vendor.md
+++ b/commands/vendor.md
@@ -35,9 +35,9 @@ Avklar hvis ikke kjent:
 
 ### 3. Les kunnskapsbasene
 
-- `skills/ms-ai-governance/references/monitoring-observability/data-residency-audit-monitoring.md` — Schrems II, EDPB seks-stegs-TIA, CLOUD Act/FISA 702-restanalyse for tredjelandsoverføring
-- `skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md` — deployerforpliktelser hvis leverandøren leverer et AI-system
-- `skills/ms-ai-advisor/references/architecture/security.md` — sikkerhetskrav til eksterne tjenester
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/monitoring-observability/data-residency-audit-monitoring.md` — Schrems II, EDPB seks-stegs-TIA, CLOUD Act/FISA 702-restanalyse for tredjelandsoverføring
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-governance/references/responsible-ai/ai-act-deployer-obligations.md` — deployerforpliktelser hvis leverandøren leverer et AI-system
+- `${CLAUDE_PLUGIN_ROOT}/skills/ms-ai-advisor/references/architecture/security.md` — sikkerhetskrav til eksterne tjenester
 
 For personvern-/cross-border-dybde: deleger til `/architect:dpia` (full TIA). For anskaffelseskrav: `/architect:anskaffelse`.
 
diff --git a/tests/kb-update/test-validate-plugin.test.mjs b/tests/kb-update/test-validate-plugin.test.mjs
new file mode 100644
index 0000000..6040773
--- /dev/null
+++ b/tests/kb-update/test-validate-plugin.test.mjs
@@ -0,0 +1,25 @@
+// Wires the static plugin validator (tests/validate-plugin.sh) into the canonical
+// node --test suite so its checks — including RX-P1 Check 6 (install-mode path &
+// delegation safety) — are enforced on every suite run, not just manual invocation.
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const pluginRoot = join(here, '..', '..'); // tests/kb-update -> plugin root
+const script = join(pluginRoot, 'tests', 'validate-plugin.sh');
+
+test('validate-plugin.sh passes (frontmatter, encoding, KB refs, plugin.json, install-mode Check 6)', () => {
+  let out;
+  try {
+    out = execFileSync('bash', [script], { encoding: 'utf8', cwd: pluginRoot });
+  } catch (err) {
+    assert.fail(
+      `validate-plugin.sh exited ${err.status}:\n${err.stdout || ''}${err.stderr || ''}`,
+    );
+  }
+  assert.match(out, /VALIDATION PASSED/);
+  assert.doesNotMatch(out, /VALIDATION FAILED/);
+});
diff --git a/tests/validate-plugin.sh b/tests/validate-plugin.sh
index 334f77f..9a09374 100755
--- a/tests/validate-plugin.sh
+++ b/tests/validate-plugin.sh
@@ -277,6 +277,80 @@ fi
 
 echo ""
 
+# -------------------------------------------------------
+# Check 6: Install-mode Path & Delegation Safety (RX-P1)
+# -------------------------------------------------------
+# Bundled-file references and agent delegations must resolve when the plugin is
+# INSTALLED from a marketplace (cwd = user project, not plugin root). Relative
+# 'skills/...' paths and bare/wrong-namespace agent names silently break there.
+echo "--- Check 6: Install-mode Path & Delegation Safety ---"
+
+# 6a: every bundled 'skills/' reference must be ${CLAUDE_PLUGIN_ROOT}-anchored
+path_offenders=0
+for f in "$PLUGIN_ROOT"/commands/*.md "$PLUGIN_ROOT"/agents/*.md; do
+  [ -f "$f" ] || continue
+  rel="${f#$PLUGIN_ROOT/}"
+  # Blank out correctly-anchored refs, then flag any remaining bare 'skills/'
+  bare="$(sed 's|${CLAUDE_PLUGIN_ROOT}/skills/|__ANCHORED__/|g' "$f" | grep -nE 'skills/[a-zA-Z0-9_-]+/' || true)"
+  if [ -n "$bare" ]; then
+    while IFS= read -r bline; do
+      [ -n "$bline" ] || continue
+      lineno="${bline%%:*}"
+      fail "$rel:$lineno: bare 'skills/' path (needs \${CLAUDE_PLUGIN_ROOT}/ prefix for installed mode)"
+      path_offenders=$((path_offenders + 1))
+    done <<< "$bare"
+  fi
+done
+if [ "$path_offenders" -eq 0 ]; then
+  pass "All skills/ references are \${CLAUDE_PLUGIN_ROOT}-anchored"
+fi
+
+# 6b: command agent-delegations must use 'general-purpose' or the registered
+#     scoped name '<plugin>:<agent>' (bare names / wrong namespace break installed)
+PLUGIN_NAME="$(grep -o '"name"[^,]*' "$plugin_json" | head -1 | sed 's/.*: *"//; s/"//')"
+deleg_offenders=0
+while IFS= read -r hit; do
+  [ -n "$hit" ] || continue
+  loc="${hit%%:Task(*}"          # /abs/commands/foo.md:NN
+  token="${hit##*:Task(}"        # delegation token
+  rel="${loc%:*}"; rel="${rel#$PLUGIN_ROOT/}"
+  lineno="${loc##*:}"
+  if [ "$token" = "general-purpose" ]; then
+    continue
+  fi
+  case "$token" in
+    "$PLUGIN_NAME":*)
+      suffix="${token##*:}"
+      if [ -f "$PLUGIN_ROOT/agents/$suffix.md" ]; then
+        continue
+      else
+        fail "$rel:$lineno: Task($token) — no matching agents/$suffix.md"
+        deleg_offenders=$((deleg_offenders + 1))
+      fi
+      ;;
+    *)
+      fail "$rel:$lineno: Task($token) — use 'general-purpose' or '$PLUGIN_NAME:<agent>' (bare/wrong-namespace breaks installed mode)"
+      deleg_offenders=$((deleg_offenders + 1))
+      ;;
+  esac
+done < <(grep -noE 'Task\([a-zA-Z0-9_:.-]+' "$PLUGIN_ROOT"/commands/*.md 2>/dev/null || true)
+if [ "$deleg_offenders" -eq 0 ]; then
+  pass "All command agent-delegations use general-purpose or registered scoped names"
+fi
+
+# 6c: no sonnet/haiku pinned in Task delegations (operator directive: opus only)
+model_hits="$(grep -nE 'Task\([^)]*(sonnet|haiku)' "$PLUGIN_ROOT"/commands/*.md 2>/dev/null || true)"
+if [ -n "$model_hits" ]; then
+  while IFS= read -r mline; do
+    [ -n "$mline" ] || continue
+    fail "${mline#$PLUGIN_ROOT/}: non-opus model pinned in Task delegation"
+  done <<< "$model_hits"
+else
+  pass "No sonnet/haiku pinned in Task delegations"
+fi
+
+echo ""
+
 # -------------------------------------------------------
 # Summary
 # -------------------------------------------------------