diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32a5b64b..87f29cf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,15 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Fixed
-
-- Fixed usage of yq, and jq in check-opsrecipes.sh
-- Fetch jq with make install-tools
-
 ### Added
 
 - Added a new alerting rule to `falco.rules.yml` to fire an alert for XZ-backdoor.
-- Add `CiliumAPITooSlow`.
+- Added `CiliumAPITooSlow`.
+- Added `CODEOWNERS` files.
 
 ### Changed
 
@@ -30,7 +26,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix and improve the ops-recipe test script.
+- Fixed usage of yq, and jq in check-opsrecipes.sh
+- Fetch jq with make install-tools
+- Fix and improve the check-opsrecipes.sh script so support <directory>/_index.md based ops-recipes.
 - Fix cabbage alerts for multi-provider wcs.
 - Fix shield alert area labels.
 - Fix `cert-exporter` alerting.
diff --git a/CODEOWNERS b/CODEOWNERS
index 0200516f..28f07ef1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,9 @@
-# generated by giantswarm/github actions - changes will be overwritten
 * @giantswarm/team-atlas
+/helm/prometheus-rules/templates/kaas/bigmac/ @team-bigmac
+/helm/prometheus-rules/templates/kaas/phoenix/ @team-phoenix
+/helm/prometheus-rules/templates/kaas/rocket/ @team-rocket
+/helm/prometheus-rules/templates/kaas/turtles/ @team-turtles
+/helm/prometheus-rules/templates/platform/atlas/ @team-atlas
+/helm/prometheus-rules/templates/platform/cabbage/ @team-cabbage
+/helm/prometheus-rules/templates/platform/honeybadger/ @team-honeybadger
+/helm/prometheus-rules/templates/platform/shield/ @team-shield