diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 4ef84b41b94b..a123644d028f 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -174,7 +174,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable).
 
-- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](#opt-services.pds.enable).
+- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as {option}`services.pds`.
 
 - [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](#opt-services.anubis.defaultOptions).
 
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index db028db407e9..9728c8761b22 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -210,6 +210,8 @@
 
 - `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`,
 
+- `services.pds` has been renamed to `services.bluesky-pds`.
+
 - The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).
   With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8754c3a0ad2c..8713082efb4c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1537,6 +1537,7 @@
   ./services/web-apps/audiobookshelf.nix
   ./services/web-apps/baikal.nix
   ./services/web-apps/bluemap.nix
+  ./services/web-apps/bluesky-pds.nix
   ./services/web-apps/bookstack.nix
   ./services/web-apps/c2fmzq-server.nix
   ./services/web-apps/calibre-web.nix
@@ -1655,7 +1656,6 @@
   ./services/web-apps/openwebrx.nix
   ./services/web-apps/outline.nix
   ./services/web-apps/part-db.nix
-  ./services/web-apps/pds.nix
   ./services/web-apps/peering-manager.nix
   ./services/web-apps/peertube-runner.nix
   ./services/web-apps/peertube.nix
diff --git a/nixos/modules/services/web-apps/pds.nix b/nixos/modules/services/web-apps/bluesky-pds.nix
similarity index 86%
rename from nixos/modules/services/web-apps/pds.nix
rename to nixos/modules/services/web-apps/bluesky-pds.nix
index b17cd628c157..56611917f0c8 100644
--- a/nixos/modules/services/web-apps/pds.nix
+++ b/nixos/modules/services/web-apps/bluesky-pds.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  cfg = config.services.pds;
+  cfg = config.services.bluesky-pds;
 
   inherit (lib)
     getExe
@@ -21,7 +21,7 @@ let
 
   pdsadminWrapper =
     let
-      cfgSystemd = config.systemd.services.pds.serviceConfig;
+      cfgSystemd = config.systemd.services.bluesky-pds.serviceConfig;
     in
     pkgs.writeShellScriptBin "pdsadmin" ''
       DUMMY_PDS_ENV_FILE="$(mktemp)"
@@ -29,15 +29,26 @@ let
       env "PDS_ENV_FILE=$DUMMY_PDS_ENV_FILE"                                                   \
           ${escapeShellArgs cfgSystemd.Environment}                                            \
           ${concatMapStringsSep " " (envFile: "$(cat ${envFile})") cfgSystemd.EnvironmentFile} \
-          ${getExe pkgs.pdsadmin} "$@"
+          ${getExe pkgs.bluesky-pdsadmin} "$@"
     '';
 in
 # All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh
 {
-  options.services.pds = {
+  imports = [
+    (lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ])
+    (lib.mkRenamedOptionModule [ "services" "pds" "package" ] [ "services" "bluesky-pds" "package" ])
+    (lib.mkRenamedOptionModule [ "services" "pds" "settings" ] [ "services" "bluesky-pds" "settings" ])
+    (lib.mkRenamedOptionModule
+      [ "services" "pds" "environmentFiles" ]
+      [ "services" "bluesky-pds" "environmentFiles" ]
+    )
+    (lib.mkRenamedOptionModule [ "services" "pds" "pdsadmin" ] [ "services" "bluesky-pds" "pdsadmin" ])
+  ];
+
+  options.services.bluesky-pds = {
     enable = mkEnableOption "pds";
 
-    package = mkPackageOption pkgs "pds" { };
+    package = mkPackageOption pkgs "bluesky-pds" { };
 
     settings = mkOption {
       type = types.submodule {
@@ -154,7 +165,7 @@ in
       enable = mkOption {
         type = types.bool;
         default = cfg.enable;
-        defaultText = literalExpression "config.services.pds.enable";
+        defaultText = literalExpression "config.services.bluesky-pds.enable";
         description = "Add pdsadmin script to PATH";
       };
     };
@@ -165,8 +176,8 @@ in
       systemPackages = [ pdsadminWrapper ];
     };
 
-    systemd.services.pds = {
-      description = "pds";
+    systemd.services.bluesky-pds = {
+      description = "bluesky pds";
 
       after = [ "network-online.target" ];
       wants = [ "network-online.target" ];