diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dc3b2187d0..2460e2a71d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,6 +9,8 @@
 
 # CI/CD and configs
 /.github/       @borda @carmocca @akihironitta @tchaton
+/.circleci/     @borda @carmocca @akihironitta @tchaton
+/.azure/        @borda @carmocca @akihironitta @tchaton
 /dockers/       @borda @carmocca @akihironitta @tchaton
 *.yml           @borda @carmocca @akihironitta @tchaton