diff --git a/CLAUDE.md b/CLAUDE.md
index 42b3079..3f3dbf1 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## What This Repository Is
 
-This is a **skills source repository** — one of potentially many that feed into the [agentic-plugins-catalog](https://github.com/RHEcosystemAppEng/agentic-plugins-catalog). It contains agentic packs with skills, MCP server configurations, AI-optimized documentation, and catalog metadata for Red Hat platforms.
+This is a **skills source repository** — one of potentially many that feed into the [agentic-catalog](https://github.com/RHEcosystemAppEng/agentic-catalog).  It contains agentic packs with skills, MCP server configurations, AI-optimized documentation, and catalog metadata for Red Hat platforms.
 
 Contributors work here to create, improve, and validate skills. An internal process periodically fetches content from this repository (and others like it) to build the unified catalog and marketplace. **This repo does not serve the marketplace directly** — it is a source of skills that the catalog aggregates.
 
diff --git a/CODEOWNERS b/CODEOWNERS
index 63b4d5f..8a67b55 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -8,20 +8,19 @@
 * @r2dedios @dmartinol @ikrispin @nemerna
 
 # Pack owners
-rh-sre/ @r2dedios
-rh-developer/ @r2dedios
-rh-virt/ @r2dedios
-ocp-admin/ @r2dedios
-rh-ai-engineer/ @r2dedios
-rh-automation/ @r2dedios
-rh-basic/ @r2dedios
-rh-support-engineer/ @r2dedios
+rh-sre/              @dmartinol
+rh-developer/        @ikrispin
+rh-virt/             @r2dedios
+ocp-admin/           @r2dedios
+rh-ai-engineer/      @ikrispin
+rh-automation/       @nemerna
+rh-basic/            @r2dedios
+rh-support-engineer/ 
 
 # CI, scripts, and repo-wide config
 .github/ @r2dedios @dmartinol
 scripts/ @r2dedios @dmartinol
-marketplace/ @r2dedios @dmartinol
 catalog/ @r2dedios @dmartinol
-CLAUDE.md @r2dedios
-SKILL_DESIGN_PRINCIPLES.md @r2dedios
-CONTRIBUTING.md @r2dedios
+CLAUDE.md @r2dedios @dmartinol
+SKILL_DESIGN_PRINCIPLES.md @r2dedios @dmartinol
+CONTRIBUTING.md @r2dedios @dmartinol