diff --git a/go.mod b/go.mod
index 9b49723..ba0f1f9 100644
--- a/go.mod
+++ b/go.mod
@@ -46,10 +46,6 @@
 // is outdated and gazelle needs it.
 replace github.com/bazelbuild/buildtools => github.com/bazelbuild/buildtools v0.0.0-20231103205921-433ea8554e82
 
-// Replace with our patched library to support hardware listings for a whole
-// organization at once.
-replace github.com/packethost/packngo => github.com/monogon-dev/packngo v0.0.0-20240122175436-ecbd9eb00ddb
-
 // https://github.com/mattn/go-sqlite3/issues/1164
 replace github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.24
 
diff --git a/metropolis/handbook/src/ch02-00-local-demo-cluster.md b/metropolis/handbook/src/ch02-00-local-demo-cluster.md
index 5c08569..d200bd5 100644
--- a/metropolis/handbook/src/ch02-00-local-demo-cluster.md
+++ b/metropolis/handbook/src/ch02-00-local-demo-cluster.md
@@ -116,7 +116,7 @@
 
 ## Using the cluster
 
-At this point you can start exploring Metropolis. Try playing with *kubectl*, or take a look at the [Cluster API](https://github.com/monogon-dev/monogon/blob/main/metropolis/handbook/src/ch03-05-cluster-api.md) chapter of this handbook.
+At this point you can start exploring Metropolis. Try playing with *kubectl*, or take a look at the [Cluster API](ch03-05-cluster-api.md) chapter of this handbook.
 
 The cluster state should be reflected by *kubectl* output:
 ```shell
diff --git a/metropolis/node/core/curator/BUILD.bazel b/metropolis/node/core/curator/BUILD.bazel
index fffb664..497bf7d 100644
--- a/metropolis/node/core/curator/BUILD.bazel
+++ b/metropolis/node/core/curator/BUILD.bazel
@@ -71,7 +71,7 @@
         "state_test.go",
     ],
     embed = [":curator"],
-    # TODO: https://github.com/monogon-dev/monogon/issues/191
+    # TODO: https://github.com/monogon/monogon/issues/191
     flaky = True,
     deps = [
         "//metropolis/node",
diff --git a/metropolis/node/core/mounts.go b/metropolis/node/core/mounts.go
index 8b23b72..eadc849 100644
--- a/metropolis/node/core/mounts.go
+++ b/metropolis/node/core/mounts.go
@@ -31,7 +31,7 @@
 		// Nothing in Metropolis currently uses /dev/shm, but it's required
 		// by containerd when the host IPC namespace is shared, which
 		// is required by "kubectl debug node/" and specific customer applications.
-		// https://github.com/monogon-dev/monogon/issues/305.
+		// https://github.com/monogon/monogon/issues/305.
 		{"/dev/shm", "tmpfs", unix.MS_NOEXEC | unix.MS_NOSUID | unix.MS_NODEV},
 	} {
 		if err := os.MkdirAll(el.dir, 0755); err != nil {
diff --git a/metropolis/node/core/roleserve/BUILD.bazel b/metropolis/node/core/roleserve/BUILD.bazel
index 37ec6d1..82e9219 100644
--- a/metropolis/node/core/roleserve/BUILD.bazel
+++ b/metropolis/node/core/roleserve/BUILD.bazel
@@ -59,7 +59,7 @@
         "//metropolis/node:product_info",
     ],
     embed = [":roleserve"],
-    # TODO: https://github.com/monogon-dev/monogon/issues/250
+    # TODO: https://github.com/monogon/monogon/issues/250
     flaky = True,
     x_defs = {
         "source.monogon.dev/metropolis/node/core/productinfo.path": "$(rlocationpath //metropolis/node:product_info )",
diff --git a/metropolis/node/labels_test.go b/metropolis/node/labels_test.go
index 08c27bb..530bbfa 100644
--- a/metropolis/node/labels_test.go
+++ b/metropolis/node/labels_test.go
@@ -30,7 +30,7 @@
 		{"../annotation", errDomainNameInvalid},
 		{"tcp:80.example.com/annotation", errDomainNameInvalid},
 		{"80/annotation", errDomainNameEndsInNumber},
-		{"github.com/monogon-dev/monogon/annotation", ErrLabelInvalidPrefix},
+		{"github.com/monogon/monogon/annotation", ErrLabelInvalidPrefix},
 	} {
 		if got := ValidateLabelKey(te.in); !errors.Is(got, te.want) {
 			t.Errorf("%d (%q): wanted %v, got %v", i, te.in, te.want, got)
@@ -61,7 +61,7 @@
 		{"./annotation", ErrLabelInvalidFirstCharacter},
 		{"../annotation", ErrLabelInvalidFirstCharacter},
 		{"tcp:80.example.com/annotation", ErrLabelInvalidCharacter},
-		{"github.com/monogon-dev/monogon/annotation", ErrLabelInvalidCharacter},
+		{"github.com/monogon/monogon/annotation", ErrLabelInvalidCharacter},
 	} {
 		// Test our implementation against test cases.
 		if got := ValidateLabelValue(te.in); !errors.Is(got, te.want) {
diff --git a/osbase/bringup/bringup.go b/osbase/bringup/bringup.go
index 8fcb8fe..d4d978a 100644
--- a/osbase/bringup/bringup.go
+++ b/osbase/bringup/bringup.go
@@ -231,7 +231,7 @@
 		// Nothing currently uses /dev/shm, but it's required
 		// by containerd when the host IPC namespace is shared, which
 		// is required by "kubectl debug node/" and specific customer applications.
-		// https://github.com/monogon-dev/monogon/issues/305.
+		// https://github.com/monogon/monogon/issues/305.
 		{"/dev/shm", "tmpfs", unix.MS_NOEXEC | unix.MS_NOSUID | unix.MS_NODEV, ""},
 		{"/sys/fs/cgroup", "cgroup2", unix.MS_NOEXEC | unix.MS_NOSUID | unix.MS_NODEV, "nsdelegate,memory_recursiveprot"},
 	} {
diff --git a/osbase/supervisor/BUILD.bazel b/osbase/supervisor/BUILD.bazel
index 2fc6634..0e0ef49 100644
--- a/osbase/supervisor/BUILD.bazel
+++ b/osbase/supervisor/BUILD.bazel
@@ -28,7 +28,7 @@
     name = "supervisor_test",
     srcs = ["supervisor_test.go"],
     embed = [":supervisor"],
-    # TODO: https://github.com/monogon-dev/monogon/issues/131
+    # TODO: https://github.com/monogon/monogon/issues/131
     flaky = True,
     deps = ["//osbase/logtree"],
 )
diff --git a/third_party/sandboxroot/regenerate.sh b/third_party/sandboxroot/regenerate.sh
index 4104696..750fb21 100755
--- a/third_party/sandboxroot/regenerate.sh
+++ b/third_party/sandboxroot/regenerate.sh
@@ -14,7 +14,7 @@
   "glibc-static"
 
   # Required to build static CGO binaries
-  # see monogon-dev/monogon#192
+  # see https://github.com/monogon/monogon/issues/192
   "libstdc++-static"
 
   # Kernel build