diff --git a/ci/OWNERS b/ci/OWNERS
index 65fca06c3879..49a4b4c7dbb7 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -333,6 +333,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/development/dhall-modules      @Gabriella439 @Profpatsch
 /pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch
 
+# Agda
+/pkgs/build-support/agda                  @NixOS/agda
+/pkgs/top-level/agda-packages.nix         @NixOS/agda
+/pkgs/development/libraries/agda          @NixOS/agda
+/doc/languages-frameworks/agda.section.md @NixOS/agda
+/nixos/tests/agda.nix                     @NixOS/agda
+
 # Idris
 /pkgs/development/idris-modules @Infinisil
 /pkgs/development/compilers/idris2 @mattpolzin
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9315a5de7c33..aea170d5b39a 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -45,6 +45,17 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  agda = {
+    members = [
+      alexarice
+      ncfavier
+      phijor
+      turion
+    ];
+    scope = "Maintain Agda-related packages and modules.";
+    shortName = "Agda";
+  };
+
   android = {
     members = [
       adrian-gierakowski
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index e7250a42e6db..a44decc86752 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -380,6 +380,7 @@ package-maintainers:
     - sitemap
   ncfavier:
     - Agda
+    - agda2hs
     - irc-client
     - lambdabot
     - shake
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d8774a01c39a..1df2ba2b8d74 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -56750,6 +56750,7 @@ self: {
       description = "Compiling Agda code to readable Haskell";
       license = lib.licenses.bsd3;
       mainProgram = "agda2hs";
+      maintainers = [ lib.maintainers.ncfavier ];
     }
   ) { };