diff --git a/README.md b/README.md
index 009f97d..b59e637 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ like shown in this example flake:
 
     inputs = {
       nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-      nixarr.url = "github:rasmus-kirk/nixarr";
+      nixarr.url = "github:nix-media-server/nixarr";
     };
 
     outputs = { 
diff --git a/docs/wiki/setup/index.md b/docs/wiki/setup/index.md
index b326240..445bb27 100644
--- a/docs/wiki/setup/index.md
+++ b/docs/wiki/setup/index.md
@@ -31,10 +31,11 @@ option, which by default is set to `/data/media`.
 
 ## Transmission
 
-Transmission should already be setup and running since it's configured
-with JSON, and can therefore be configured with nix. The most basic settings are already set. See the following links for more info:
+Transmission should already be setup and running since it's configured with
+JSON, and can therefore be configured with nix. The most basic settings are
+already set. See the following links for more info:
 
-- [The configured Nixarr defaults for transmission](https://github.com/rasmus-kirk/nixarr/blob/28d1be070deb1a064c1967889c11c8921752fa09/nixarr/transmission/default.nix#L355)
+- [The configured Nixarr defaults for transmission](https://github.com/nix-media-server/nixarr/blob/28d1be070deb1a064c1967889c11c8921752fa09/nixarr/transmission/default.nix#L355)
 - [The `nixarr.transmission` options](https://nixarr.com/nixos-options/#nixarr.transmission.enable)
 - [Settings that can be passed through `nixarr.transmission.settings`]
 
diff --git a/docs/wiki/vpn/ports/index.md b/docs/wiki/vpn/ports/index.md
index 0389285..3270d82 100644
--- a/docs/wiki/vpn/ports/index.md
+++ b/docs/wiki/vpn/ports/index.md
@@ -29,9 +29,6 @@ Then you can set that port for a service, for example
 
 ## Debugging Ports
 
-> **Note:** See [this GH issue](https://github.com/rasmus-kirk/nixarr/issues/27)
->           first, since it's a common problem
-
 You can debug an open port using the
 [nixarr.vpn.vpnTestService](https://nixarr.com/options.html#nixarr.vpn.vpntestservice.enable):
 
diff --git a/flake.nix b/flake.nix
index 90c404a..59e758b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -101,7 +101,7 @@
             }
             {
               title = "Github";
-              location = "https://github.com/rasmus-kirk/nixarr";
+              location = "https://github.com/nix-media-server/nixarr";
             }
           ];
           favicons = {
diff --git a/nixarr/recyclarr/default.nix b/nixarr/recyclarr/default.nix
index 97c4156..2786832 100644
--- a/nixarr/recyclarr/default.nix
+++ b/nixarr/recyclarr/default.nix
@@ -10,7 +10,7 @@ with lib; let
   nixarr = config.nixarr;
   # This is a carbon copy of the yaml implementation in nixpkgs https://github.com/NixOS/nixpkgs/blob/fde6c4aec177afa2d0248b1c5983e2a72a231442/pkgs/pkgs-lib/formats.nix#L210-L231
   # except we've replaced json2yaml for yq-go to allow it to parse custom yaml tags
-  # ideally this would some day be upstreamed, see https://github.com/NixOS/nix/issues/4910 and https://github.com/rasmus-kirk/nixarr/issues/91
+  # ideally this would some day be upstreamed, see https://github.com/NixOS/nix/issues/4910 and https://github.com/nix-media-server/nixarr/issues/91
   yamlGenerator = {preserved-tags ? []}: let
     selectors =
       pkgs.lib.strings.concatStringsSep "|"