diff --git a/Documentation/nvme-config.txt b/Documentation/nvme-config.txt
index 98009e4d8e..f5df34c2c1 100644
--- a/Documentation/nvme-config.txt
+++ b/Documentation/nvme-config.txt
@@ -36,7 +36,7 @@ DESCRIPTION
 Read in the NVMe over Fabrics configuration from the specified JSON
 configuration file and allow to update or modify the contents.
 The JSON configuration file format is documented in
-https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json
+https://github.com/linux-nvme/nvme-cli/blob/master/libnvme/doc/config-schema.json
 
 OPTIONS
 -------
@@ -201,7 +201,7 @@ SEE ALSO
 --------
 nvme-discover(1)
 nvme-connect(1)
-https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json
+https://github.com/linux-nvme/nvme-cli/blob/master/libnvme/doc/config-schema.json
 
 AUTHORS
 -------
diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
index 68708e5ffb..a08aaa27aa 100644
--- a/Documentation/nvme-connect-all.txt
+++ b/Documentation/nvme-connect-all.txt
@@ -127,7 +127,7 @@ OPTIONS
 	default @SYSCONFDIR@/nvme/config.json file or 'none' to not read in
 	an existing configuration file. The JSON configuration file
 	format is documented in
-	https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json
+	https://github.com/linux-nvme/nvme-cli/blob/master/libnvme/doc/config-schema.json
 
 -k <#>::
 --keep-alive-tmo=<#>::
diff --git a/Documentation/nvme-connect.txt b/Documentation/nvme-connect.txt
index a18ff0b861..65d5cfbf23 100644
--- a/Documentation/nvme-connect.txt
+++ b/Documentation/nvme-connect.txt
@@ -102,7 +102,7 @@ OPTIONS
 	default @SYSCONFDIR@/nvme/config.json file or 'none' to not read in
 	an existing configuration file. The JSON configuration file
 	format is documented in
-	https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json
+	https://github.com/linux-nvme/nvme-cli/blob/master/libnvme/doc/config-schema.json
 
 -S <secret>::
 --dhchap-secret=<secret>::
diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt
index e3017eb964..49259e045f 100644
--- a/Documentation/nvme-discover.txt
+++ b/Documentation/nvme-discover.txt
@@ -146,7 +146,7 @@ OPTIONS
 	default @SYSCONFDIR@/nvme/config.json file or 'none' to not read in
 	an existing configuration file. The JSON configuration file
 	format is documented in
-	https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json
+	https://github.com/linux-nvme/nvme-cli/blob/master/libnvme/doc/config-schema.json
 
 -k <#>::
 --keep-alive-tmo=<#>::
diff --git a/libnvme/README.md b/libnvme/README.md
index 0d134fe6d6..04010368a4 100644
--- a/libnvme/README.md
+++ b/libnvme/README.md
@@ -1,11 +1,9 @@
 # libnvme
 
-![MesonBuild](https://github.com/linux-nvme/libnvme/actions/workflows/build.yml/badge.svg)
-![PyBuild](https://github.com/linux-nvme/libnvme/actions/workflows/release-python.yml/badge.svg)
+![PyBuild](https://github.com/linux-nvme/nvme-cli/actions/workflows/release-python.yml/badge.svg)
 [![PyPI](https://img.shields.io/pypi/v/libnvme)](https://pypi.org/project/libnvme/)
 [![PyPI - Wheel](https://img.shields.io/pypi/wheel/libnvme)](https://pypi.org/project/libnvme/)
-![GitHub](https://img.shields.io/github/license/linux-nvme/libnvme)
-[![codecov](https://codecov.io/gh/linux-nvme/libnvme/branch/master/graph/badge.svg)](https://codecov.io/gh/linux-nvme/libnvme)
+[![codecov](https://codecov.io/gh/linux-nvme/nvme-cli/branch/master/graph/badge.svg)](https://codecov.io/gh/linux-nvme/nvme-cli)
 [![Read the Docs](https://img.shields.io/readthedocs/libnvme)](https://libnvme.readthedocs.io/en/latest/)
 
 This is the libnvme development C library. libnvme provides type
diff --git a/libnvme/doc/config-schema.json b/libnvme/doc/config-schema.json
index 29ef77ed1c..47d883723e 100644
--- a/libnvme/doc/config-schema.json
+++ b/libnvme/doc/config-schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://github.com/linux-nvme/libnvme/doc/config-schema.json",
+    "$id": "https://github.com/linux-nvme/nvme-cli/libnvme/doc/config-schema.json",
     "title": "config.json",
     "description": "libnvme JSON configuration",
     "type": "object",
diff --git a/libnvme/doc/config-schema.json.in b/libnvme/doc/config-schema.json.in
index 29ef77ed1c..47d883723e 100644
--- a/libnvme/doc/config-schema.json.in
+++ b/libnvme/doc/config-schema.json.in
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://github.com/linux-nvme/libnvme/doc/config-schema.json",
+    "$id": "https://github.com/linux-nvme/nvme-cli/libnvme/doc/config-schema.json",
     "title": "config.json",
     "description": "libnvme JSON configuration",
     "type": "object",