diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix
index 1b7cc0fa54c9..9df89c65a3cf 100644
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@@ -95,7 +95,7 @@ let
       package = mkOption {
         type = types.package;
         description = "Akkoma frontend package.";
-        example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";
+        example = literalExpression "pkgs.akkoma-fe";
       };
 
       name = mkOption {
@@ -520,12 +520,12 @@ in {
         type = with types; attrsOf (submodule frontend);
         default = {
           primary = {
-            package = pkgs.akkoma-frontends.akkoma-fe;
+            package = pkgs.akkoma-fe;
             name = "akkoma-fe";
             ref = "stable";
           };
           admin = {
-            package = pkgs.akkoma-frontends.admin-fe;
+            package = pkgs.akkoma-admin-fe;
             name = "admin-fe";
             ref = "stable";
           };
@@ -533,12 +533,12 @@ in {
         defaultText = literalExpression ''
           {
             primary = {
-              package = pkgs.akkoma-frontends.akkoma-fe;
+              package = pkgs.akkoma-fe;
               name = "akkoma-fe";
               ref = "stable";
             };
             admin = {
-              package = pkgs.akkoma-frontends.admin-fe;
+              package = pkgs.akkoma-admin-fe;
               name = "admin-fe";
               ref = "stable";
             };
@@ -557,7 +557,7 @@ in {
         default = null;
         example = literalExpression ''
           {
-            "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
+            "emoji/blobs.gg" = pkgs.blobs_gg;
             "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" '''
               …
             ''';
diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
similarity index 98%
rename from pkgs/servers/akkoma/admin-fe/default.nix
rename to pkgs/by-name/ak/akkoma-admin-fe/package.nix
index 7faac39ee53e..9bfbd2295f16 100644
--- a/pkgs/servers/akkoma/admin-fe/default.nix
+++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "admin-fe";
-  version = "unstable-2024-04-27";
+  version = "2.3.0-2-unstable-2024-04-27";
 
   src = fetchFromGitea {
     domain = "akkoma.dev";
diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/by-name/ak/akkoma-fe/package.nix
similarity index 100%
rename from pkgs/servers/akkoma/akkoma-fe/default.nix
rename to pkgs/by-name/ak/akkoma-fe/package.nix
diff --git a/pkgs/servers/akkoma/mime.exs b/pkgs/by-name/ak/akkoma/mime.exs
similarity index 100%
rename from pkgs/servers/akkoma/mime.exs
rename to pkgs/by-name/ak/akkoma/mime.exs
diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/by-name/ak/akkoma/package.nix
similarity index 96%
rename from pkgs/servers/akkoma/default.nix
rename to pkgs/by-name/ak/akkoma/package.nix
index fbc2ea15d890..c2d6995049e0 100644
--- a/pkgs/servers/akkoma/default.nix
+++ b/pkgs/by-name/ak/akkoma/package.nix
@@ -77,6 +77,7 @@ beamPackages.mixRelease rec {
   meta = {
     description = "ActivityPub microblogging server";
     homepage = "https://akkoma.social";
+    changelog = "https://akkoma.dev/AkkomaGang/akkoma/releases/tag/v${version}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ mvs ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/servers/akkoma/emoji/blobs_gg.nix b/pkgs/by-name/bl/blobs_gg/package.nix
similarity index 100%
rename from pkgs/servers/akkoma/emoji/blobs_gg.nix
rename to pkgs/by-name/bl/blobs_gg/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 292a40eb0f2a..e9aab7b7b809 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -148,6 +148,13 @@ mapAliases {
   afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
   agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10"
   ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12
+  akkoma-emoji = recurseIntoAttrs {
+    blobs_gg = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
+  };
+  akkoma-frontends = recurseIntoAttrs {
+    admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
+    akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
+  };
   alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25
   alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17
   alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee236ba843c8..8027a21d6b80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -922,7 +922,7 @@ with pkgs;
     type = "OPN";
   };
 
-  akkoma = callPackage ../servers/akkoma {
+  akkoma = callPackage ../by-name/ak/akkoma/package.nix {
     beamPackages = beam_nox.packages.erlang_26.extend (self: super: {
       elixir = self.elixir_1_16;
       rebar3 = self.rebar3WithPlugins {
@@ -930,16 +930,9 @@ with pkgs;
       };
     });
   };
-  akkoma-frontends = recurseIntoAttrs {
-    akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
-    admin-fe = callPackage ../servers/akkoma/admin-fe {
-      nodejs = nodejs_18;
-      yarn = yarn.override { nodejs = nodejs_18; };
-      python3 = python311;
-    };
-  };
-  akkoma-emoji = recurseIntoAttrs {
-    blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };
+
+  akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix {
+    python3 = python311;
   };
 
   aegisub = callPackage ../by-name/ae/aegisub/package.nix ({