diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 712e61a1e..7b10bb428 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,3 +5,9 @@
 # Worker code
 /internal/worker/       @thozza
 /cmd/osbuild-worker/    @thozza
+
+# Service deployment
+# (note: last match wins)
+/templates/ @croissanne @kingsleyzissou @schuellerf @thozza
+/templates/dashboards/ @croissanne @kingsleyzissou @schuellerf @thozza
+