diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 85f64d357539..83ca673e1830 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -606,17 +606,6 @@
     githubId = 50264672;
     name = "Adam Freeth";
   };
-  adamperkowski = {
-    name = "Adam Perkowski";
-    email = "me@adamperkowski.dev";
-    matrix = "@adam:matrix.system72.dev";
-    github = "koibtw";
-    githubId = 75480869;
-    keys = [
-      { fingerprint = "00F6 1623 FB56 BC5B B709  4E63 4CE6 C117 2DF6 BE79"; }
-      { fingerprint = "5A53 0832 DA91 20B0 CA57  DDB6 7CBD B58E CF1D 3478"; }
-    ];
-  };
   adamt = {
     email = "mail@adamtulinius.dk";
     github = "adamtulinius";
@@ -14032,6 +14021,17 @@
     githubId = 67888720;
     name = "Kira";
   };
+  koi = {
+    name = "koi";
+    email = "me@koi.rip";
+    matrix = "@koi:system72.dev";
+    github = "koibtw";
+    githubId = 75480869;
+    keys = [
+      { fingerprint = "00F6 1623 FB56 BC5B B709  4E63 4CE6 C117 2DF6 BE79"; }
+      { fingerprint = "5A53 0832 DA91 20B0 CA57  DDB6 7CBD B58E CF1D 3478"; }
+    ];
+  };
   kolaente = {
     email = "k@knt.li";
     github = "kolaente";
diff --git a/nixos/modules/programs/nvrs.nix b/nixos/modules/programs/nvrs.nix
index c8bc8817adcb..eaf3950709f8 100644
--- a/nixos/modules/programs/nvrs.nix
+++ b/nixos/modules/programs/nvrs.nix
@@ -10,7 +10,7 @@ let
   settingsFormat = pkgs.formats.toml { };
 in
 {
-  meta.maintainers = with lib.maintainers; [ adamperkowski ];
+  meta.maintainers = with lib.maintainers; [ koi ];
 
   options.programs.nvrs = {
     enable = lib.mkEnableOption "nvrs";
diff --git a/pkgs/by-name/gh/gh-webhook/package.nix b/pkgs/by-name/gh/gh-webhook/package.nix
index 86655fa75d45..1b8ad7493534 100644
--- a/pkgs/by-name/gh/gh-webhook/package.nix
+++ b/pkgs/by-name/gh/gh-webhook/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     description = "GitHub CLI extension to chatter with Webhooks";
     homepage = "https://github.com/cli/gh-webhook";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
     mainProgram = "gh-webhook";
   };
 })
diff --git a/pkgs/by-name/go/gocheat/package.nix b/pkgs/by-name/go/gocheat/package.nix
index 2812b11318c7..20a12e941a56 100644
--- a/pkgs/by-name/go/gocheat/package.nix
+++ b/pkgs/by-name/go/gocheat/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/Achno/gocheat";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      adamperkowski
+      koi
       sebaguardian
     ];
     mainProgram = "gocheat";
diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix
index c1f76526eed5..18c015796dc9 100644
--- a/pkgs/by-name/ju/julec/package.nix
+++ b/pkgs/by-name/ju/julec/package.nix
@@ -122,7 +122,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     ];
     mainProgram = "julec";
     maintainers = with lib.maintainers; [
-      adamperkowski
+      koi
       sebaguardian
     ];
   };
diff --git a/pkgs/by-name/ki/kitget/package.nix b/pkgs/by-name/ki/kitget/package.nix
index 76f665e7de68..6dc995e5de14 100644
--- a/pkgs/by-name/ki/kitget/package.nix
+++ b/pkgs/by-name/ki/kitget/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitea {
     domain = "codeberg.org";
-    owner = "adamperkowski";
+    owner = "koibtw";
     repo = "kitget";
     tag = "v${finalAttrs.version}";
     hash = "sha256-i26nu5SkcPhqwh+/bw1rz7h8K2u+hhSsOGiLj3sF1RQ=";
@@ -28,9 +28,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Display and customize cat images in your terminal";
-    homepage = "https://codeberg.org/adamperkowski/kitget";
+    homepage = "https://codeberg.org/koibtw/kitget";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
     mainProgram = "kitget";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/nv/nvrs/package.nix b/pkgs/by-name/nv/nvrs/package.nix
index e0509633fe8c..c184373521cf 100644
--- a/pkgs/by-name/nv/nvrs/package.nix
+++ b/pkgs/by-name/nv/nvrs/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.1.9";
 
   src = fetchFromGitHub {
-    owner = "adamperkowski";
+    owner = "koibtw";
     repo = "nvrs";
     tag = "v${finalAttrs.version}";
     hash = "sha256-6ATkebFYuOOvhzSO+gClPbtaz9/Zph4m8/cqkufRYFw=";
@@ -47,9 +47,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Fast new version checker for software releases";
     homepage = "https://nvrs.adamperkowski.dev";
-    changelog = "https://github.com/adamperkowski/nvrs/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/koibtw/nvrs/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
     mainProgram = "nvrs";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix
index 96ea96953512..84824fd0bd1d 100644
--- a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix
+++ b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix
@@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: {
     description = "Formatter plugin for Jinja2 template files";
     homepage = "https://github.com/davidodenwald/prettier-plugin-jinja-template";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
     mainProgram = "prettier-plugin-jinja-template";
   };
 })
diff --git a/pkgs/by-name/zs/zsnow/package.nix b/pkgs/by-name/zs/zsnow/package.nix
index 50af3ea0d486..253e95081101 100644
--- a/pkgs/by-name/zs/zsnow/package.nix
+++ b/pkgs/by-name/zs/zsnow/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "XSnow for Wayland";
     homepage = "https://github.com/DarkVanityOfLight/ZSnoW";
     license = lib.licenses.cc-by-nc-sa-40;
-    maintainers = [ lib.maintainers.adamperkowski ];
+    maintainers = [ lib.maintainers.koi ];
     platforms = lib.platforms.linux;
     mainProgram = "zsnow";
   };