diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e256ea5575..93aad53246 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,2 +1,2 @@
 ### Code contributor checklist:
-* [ ] I have read, understood and followed [contributing guide](https://github.com/subspace/subspace/blob/main/CONTRIBUTING.md)
+* [ ] I have read, understood and followed [contributing guide](https://github.com/autonomys/subspace/blob/main/CONTRIBUTING.md)
diff --git a/.github/workflows/chain-spec-snapshot-build.yml b/.github/workflows/chain-spec-snapshot-build.yml
index 1371a7f432..e6b21917a1 100644
--- a/.github/workflows/chain-spec-snapshot-build.yml
+++ b/.github/workflows/chain-spec-snapshot-build.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   chains-spec:
-    runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || 'ubuntu-22.04') }}
+    runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || 'ubuntu-22.04') }}
     permissions:
       contents: write
       packages: write
diff --git a/.github/workflows/domain-genesis-storage-snapshot-build.yml b/.github/workflows/domain-genesis-storage-snapshot-build.yml
index 9afacdd63b..8ff53b1b8e 100644
--- a/.github/workflows/domain-genesis-storage-snapshot-build.yml
+++ b/.github/workflows/domain-genesis-storage-snapshot-build.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   domain-genesis-storage:
-    runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || 'ubuntu-22.04') }}
+    runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || 'ubuntu-22.04') }}
     permissions:
       contents: write
       packages: write
diff --git a/.github/workflows/runtime-snapshot-build.yml b/.github/workflows/runtime-snapshot-build.yml
index f3855f73c5..06e2dcf467 100644
--- a/.github/workflows/runtime-snapshot-build.yml
+++ b/.github/workflows/runtime-snapshot-build.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   runtime:
-    runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || 'ubuntu-22.04') }}
+    runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || 'ubuntu-22.04') }}
     permissions:
       contents: write
       packages: write
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 7b6a9231f3..d86f3ae74a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -30,7 +30,7 @@ env:
 
 jobs:
   cargo-fmt:
-    runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
+    runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
 
     steps:
       - name: Checkout
@@ -57,7 +57,7 @@ jobs:
   cargo-clippy:
     strategy:
       matrix:
-        os: ${{ fromJson(github.repository_owner == 'subspace' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-14-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-22.04", "macos-14", "windows-2022"]') }}
+        os: ${{ fromJson(github.repository_owner == 'autonomys' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-14-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-22.04", "macos-14", "windows-2022"]') }}
 
     runs-on: ${{ matrix.os }}
 
@@ -115,7 +115,7 @@ jobs:
           cargo -Zgitoxide -Zgit clippy --locked --all-targets --features "runtime-benchmarks" -- -D warnings
 
   cargo-docs:
-    runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
+    runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -143,7 +143,7 @@ jobs:
   cargo-test:
     strategy:
       matrix:
-        os: ${{ fromJson(github.repository_owner == 'subspace' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-14-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-22.04", "macos-14", "windows-2022"]') }}
+        os: ${{ fromJson(github.repository_owner == 'autonomys' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-14-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-22.04", "macos-14", "windows-2022"]') }}
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/rustsec-audit.yml b/.github/workflows/rustsec-audit.yml
index 6d6bccfa8a..6799de95aa 100644
--- a/.github/workflows/rustsec-audit.yml
+++ b/.github/workflows/rustsec-audit.yml
@@ -14,7 +14,7 @@ on:
     - cron: "40 13 * * 0"
 jobs:
   security_audit:
-    runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
+    runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
     steps:
       - uses: actions/checkout@v3
       - uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 #v1.4.1
diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
index b48156e5da..c4c7613961 100644
--- a/.github/workflows/snapshot-build.yml
+++ b/.github/workflows/snapshot-build.yml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   container-linux:
-    runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
+    runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
     permissions:
       contents: write
       packages: write
@@ -92,31 +92,31 @@ jobs:
     strategy:
       matrix:
         build:
-          - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
             target: x86_64-unknown-linux-gnu
             suffix: ubuntu-x86_64-skylake-${{ github.ref_name }}
             rustflags: "-C target-cpu=skylake"
-          - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
             target: x86_64-unknown-linux-gnu
             suffix: ubuntu-x86_64-v2-${{ github.ref_name }}
             rustflags: "-C target-cpu=x86-64-v2 -C target-feature=+aes"
-          - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-20.04"') }}
             target: aarch64-unknown-linux-gnu
             suffix: ubuntu-aarch64-${{ github.ref_name }}
             # TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate with MSRV bump ships:
             #  https://github.com/RustCrypto/block-ciphers/pull/395
             rustflags: "-C linker=aarch64-linux-gnu-gcc --cfg aes_armv8"
-          - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }}
             target: aarch64-apple-darwin
             suffix: macos-aarch64-${{ github.ref_name }}
             # TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate with MSRV bump ships:
             #  https://github.com/RustCrypto/block-ciphers/pull/395
             rustflags: "--cfg aes_armv8"
-          - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
             target: x86_64-pc-windows-msvc
             suffix: windows-x86_64-skylake-${{ github.ref_name }}
             rustflags: "-C target-cpu=skylake"
-          - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
             target: x86_64-pc-windows-msvc
             suffix: windows-x86_64-v2-${{ github.ref_name }}
             rustflags: "-C target-cpu=x86-64-v2 -C target-feature=+aes"
@@ -255,7 +255,7 @@ jobs:
 
           echo "Done!"
         # Allow code signing to fail on non-release builds and in non-subspace repos (forks)
-        continue-on-error: ${{ github.repository_owner != 'subspace' || github.event_name != 'push' || github.ref_type != 'tag' }}
+        continue-on-error: ${{ github.repository_owner != 'autonomys' || github.event_name != 'push' || github.ref_type != 'tag' }}
         if: runner.os == 'macOS'
 
       - name: Sign Application (Windows)
@@ -263,7 +263,7 @@ jobs:
           AzureSignTool sign --azure-key-vault-url "${{ secrets.AZURE_KEY_VAULT_URI }}" --azure-key-vault-client-id "${{ secrets.AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.AZURE_TENANT_ID }}" --azure-key-vault-certificate "${{ secrets.AZURE_CERT_NAME }}" --file-digest sha512 --timestamp-rfc3161 http://timestamp.digicert.com -v "${{ env.PRODUCTION_TARGET }}/subspace-farmer.exe"
           AzureSignTool sign --azure-key-vault-url "${{ secrets.AZURE_KEY_VAULT_URI }}" --azure-key-vault-client-id "${{ secrets.AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.AZURE_TENANT_ID }}" --azure-key-vault-certificate "${{ secrets.AZURE_CERT_NAME }}" --file-digest sha512 --timestamp-rfc3161 http://timestamp.digicert.com -v "${{ env.PRODUCTION_TARGET }}/subspace-node.exe"
         # Allow code signing to fail on non-release builds and in non-subspace repos (forks)
-        continue-on-error: ${{ github.repository_owner != 'subspace' || github.event_name != 'push' || github.ref_type != 'tag' }}
+        continue-on-error: ${{ github.repository_owner != 'autonomys' || github.event_name != 'push' || github.ref_type != 'tag' }}
         if: runner.os == 'Windows'
 
       - name: Prepare executables for uploading (Ubuntu)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 32ae46c342..3552d4a3ba 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-Thanks for considering contributing to Subspace Network!
+Thanks for considering contributing to Autonomys Network!
 
 The best way to start is to join our [Forum](https://forum.subspace.network/) or
 [Discord](https://discord.gg/subspace-network), [official website](https://subspace.network/) has a bunch of learning
@@ -14,10 +14,10 @@ on GitHub productive for everyone involved.
 
 ## Process optimized for maintainers
 
-Subspace Network is maintained by a small group of passionate individuals with limited time. Number of potential outside
+Autonomys Network is maintained by a small group of passionate individuals with limited time. Number of potential outside
 contributors is much larger than number of maintainers and wider community of users is even bigger than that.
 
-As such, the process of contributing to Subspace Network needs to be optimized in such a way that it doesn't overwhelm
+As such, the process of contributing to Autonomys Network needs to be optimized in such a way that it doesn't overwhelm
 maintainers with unnecessary notifications, questions that can be answered by wider community and follow practices
 defined in this document below, such that contributions can be processed in the most productive way saving time and
 making it a better experience overall.
diff --git a/README.md b/README.md
index 7e2768ab3e..5a75a79c8c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Subspace Network Monorepo
 
-[![Latest Release](https://img.shields.io/github/v/release/subspace/subspace?display_name=tag&style=flat-square)](https://github.com/subspace/subspace/releases)
-[![Downloads Latest](https://img.shields.io/github/downloads/subspace/subspace/latest/total?style=flat-square)](https://github.com/subspace/subspace/releases/latest)
-[![Rust](https://img.shields.io/github/actions/workflow/status/subspace/subspace/rust.yml?branch=main)](https://github.com/subspace/subspace/actions/workflows/rust.yaml)
-[![Rust Docs](https://img.shields.io/github/actions/workflow/status/subspace/subspace/rustdoc.yml?branch=main)](https://subspace.github.io/subspace)
+[![Latest Release](https://img.shields.io/github/v/release/autonomys/subspace?display_name=tag&style=flat-square)](https://github.com/autonomys/subspace/releases)
+[![Downloads Latest](https://img.shields.io/github/downloads/autonomys/subspace/latest/total?style=flat-square)](https://github.com/autonomys/subspace/releases/latest)
+[![Rust](https://img.shields.io/github/actions/workflow/status/autonomys/subspace/rust.yml?branch=main)](https://github.com/autonomys/subspace/actions/workflows/rust.yaml)
+[![Rust Docs](https://img.shields.io/github/actions/workflow/status/autonomys/subspace/rustdoc.yml?branch=main)](https://autonomys.github.io/subspace)
 
 This is a mono repository for [Subspace Network](https://subspace.network/) implementation, primarily containing
 Subspace node/client using Substrate framework and farmer app implementations.
diff --git a/crates/pallet-domains/Cargo.toml b/crates/pallet-domains/Cargo.toml
index 47ee8570ea..c12ae87687 100644
--- a/crates/pallet-domains/Cargo.toml
+++ b/crates/pallet-domains/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace domains pallet"
 
 [package.metadata.docs.rs]
diff --git a/crates/pallet-domains/src/lib.rs b/crates/pallet-domains/src/lib.rs
index d219192077..4aec5d8070 100644
--- a/crates/pallet-domains/src/lib.rs
+++ b/crates/pallet-domains/src/lib.rs
@@ -619,8 +619,8 @@ mod pallet {
     /// if that consensus block contains bundle of the domain, the hash will be pruned when the ER
     /// that point to the consensus block is pruned.
     ///
-    /// TODO: this storage is unbounded in some cases, see https://github.com/subspace/subspace/issues/1673
-    /// for more details, this will be fixed once https://github.com/subspace/subspace/issues/1731 is implemented.
+    /// TODO: this storage is unbounded in some cases, see https://github.com/autonomys/subspace/issues/1673
+    /// for more details, this will be fixed once https://github.com/autonomys/subspace/issues/1731 is implemented.
     #[pallet::storage]
     #[pallet::getter(fn consensus_block_info)]
     pub type ConsensusBlockHash<T: Config> =
diff --git a/crates/pallet-domains/src/tests.rs b/crates/pallet-domains/src/tests.rs
index 7b8b9fa387..38271fa854 100644
--- a/crates/pallet-domains/src/tests.rs
+++ b/crates/pallet-domains/src/tests.rs
@@ -122,7 +122,7 @@ impl pallet_domains::HoldIdentifier<Test> for HoldIdentifier {
 
 impl VariantCount for HoldIdentifier {
     // TODO: HACK this is not the actual variant count but it is required see
-    // https://github.com/subspace/subspace/issues/2674 for more details. It
+    // https://github.com/autonomys/subspace/issues/2674 for more details. It
     // will be resolved as https://github.com/paritytech/polkadot-sdk/issues/4033.
     const VARIANT_COUNT: u32 = 10;
 }
diff --git a/crates/pallet-feeds/Cargo.toml b/crates/pallet-feeds/Cargo.toml
index 63c143ff95..beb1510455 100644
--- a/crates/pallet-feeds/Cargo.toml
+++ b/crates/pallet-feeds/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Serge Kovbasiuk <serge@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace node pallet for interacting with storage"
 readme = "README.md"
 
diff --git a/crates/pallet-grandpa-finality-verifier/Cargo.toml b/crates/pallet-grandpa-finality-verifier/Cargo.toml
index 8432b810d0..a906157640 100644
--- a/crates/pallet-grandpa-finality-verifier/Cargo.toml
+++ b/crates/pallet-grandpa-finality-verifier/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Pallet to verify GRANDPA finality proofs for Substrate based chains"
 readme = "README.md"
 
diff --git a/crates/pallet-object-store/Cargo.toml b/crates/pallet-object-store/Cargo.toml
index 80f403ddbf..ce39d3dcf3 100644
--- a/crates/pallet-object-store/Cargo.toml
+++ b/crates/pallet-object-store/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Nazar Mokrynskyi <nazar@mokrynskyi.com>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace node pallet for simple objects storage"
 readme = "README.md"
 
diff --git a/crates/pallet-offences-subspace/Cargo.toml b/crates/pallet-offences-subspace/Cargo.toml
index f7d17dc37a..4d72603a87 100644
--- a/crates/pallet-offences-subspace/Cargo.toml
+++ b/crates/pallet-offences-subspace/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>", "Subspace Labs <admin@subspa
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "offences-subspace pallet"
 readme = "README.md"
 
diff --git a/crates/pallet-rewards/Cargo.toml b/crates/pallet-rewards/Cargo.toml
index 4baf1220d7..f71d4df886 100644
--- a/crates/pallet-rewards/Cargo.toml
+++ b/crates/pallet-rewards/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Nazar Mokrynskyi <nazar@mokrynskyi.com>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Pallet for issuing rewards to block producers"
 readme = "README.md"
 include = [
diff --git a/crates/pallet-runtime-configs/Cargo.toml b/crates/pallet-runtime-configs/Cargo.toml
index 970553ec6d..67978723ae 100644
--- a/crates/pallet-runtime-configs/Cargo.toml
+++ b/crates/pallet-runtime-configs/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Liu-Cheng Xu <xuliuchengxlc@gmail.com>"]
 edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Pallet for tweaking the runtime configs for multiple network"
 include = [
     "/src",
diff --git a/crates/pallet-subspace-mmr/Cargo.toml b/crates/pallet-subspace-mmr/Cargo.toml
index 33a9ed02cb..d78dcd516b 100644
--- a/crates/pallet-subspace-mmr/Cargo.toml
+++ b/crates/pallet-subspace-mmr/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pallet-subspace-mmr"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives for Subspace MMR"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 version = "0.1.0"
diff --git a/crates/pallet-subspace/Cargo.toml b/crates/pallet-subspace/Cargo.toml
index 61f0c697df..fe6a3d49c6 100644
--- a/crates/pallet-subspace/Cargo.toml
+++ b/crates/pallet-subspace/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>", "Subspace Labs <admin@subspa
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace consensus pallet"
 readme = "README.md"
 
diff --git a/crates/pallet-transaction-fees/Cargo.toml b/crates/pallet-transaction-fees/Cargo.toml
index 12e8ba0588..407660f66b 100644
--- a/crates/pallet-transaction-fees/Cargo.toml
+++ b/crates/pallet-transaction-fees/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Nazar Mokrynskyi <nazar@mokrynskyi.com>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Pallet for charging and re-distributing transaction fees"
 readme = "README.md"
 include = [
diff --git a/crates/sc-consensus-subspace-rpc/Cargo.toml b/crates/sc-consensus-subspace-rpc/Cargo.toml
index a05765fa38..80f5f16007 100644
--- a/crates/sc-consensus-subspace-rpc/Cargo.toml
+++ b/crates/sc-consensus-subspace-rpc/Cargo.toml
@@ -6,7 +6,7 @@ description = "RPC extensions for the Subspace consensus algorithm"
 edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/crates/sc-consensus-subspace/Cargo.toml b/crates/sc-consensus-subspace/Cargo.toml
index 13700afb72..3f36bc8c8c 100644
--- a/crates/sc-consensus-subspace/Cargo.toml
+++ b/crates/sc-consensus-subspace/Cargo.toml
@@ -6,7 +6,7 @@ description = "Subspace consensus algorithm for substrate"
 edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 documentation = "https://docs.rs/sc-consensus-subspace"
 
 [package.metadata.docs.rs]
diff --git a/crates/sc-domains/Cargo.toml b/crates/sc-domains/Cargo.toml
index 49ee6e3ba6..d8991e3f54 100644
--- a/crates/sc-domains/Cargo.toml
+++ b/crates/sc-domains/Cargo.toml
@@ -6,7 +6,7 @@ description = "Subspace service."
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/crates/sp-consensus-subspace/Cargo.toml b/crates/sp-consensus-subspace/Cargo.toml
index 4d72cf7e9c..9b7e3cbe0f 100644
--- a/crates/sp-consensus-subspace/Cargo.toml
+++ b/crates/sp-consensus-subspace/Cargo.toml
@@ -6,7 +6,7 @@ description = "Primitives for Subspace consensus"
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/crates/sp-domains/Cargo.toml b/crates/sp-domains/Cargo.toml
index c1e97d7410..a75361d9f2 100644
--- a/crates/sp-domains/Cargo.toml
+++ b/crates/sp-domains/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives of domains pallet"
 
 [package.metadata.docs.rs]
diff --git a/crates/sp-domains/src/lib.rs b/crates/sp-domains/src/lib.rs
index 2630118274..b7014e2080 100644
--- a/crates/sp-domains/src/lib.rs
+++ b/crates/sp-domains/src/lib.rs
@@ -84,7 +84,7 @@ mod app {
     app_crypto!(sr25519, KEY_TYPE);
 }
 
-// TODO: this runtime constant is not support to update, see https://github.com/subspace/subspace/issues/2712
+// TODO: this runtime constant is not support to update, see https://github.com/autonomys/subspace/issues/2712
 // for more detail about the problem and what we need to do to support it.
 //
 // The domain storage fee multiplier used to charge a higher storage fee to the domain
@@ -333,7 +333,7 @@ impl<Balance> Transfers<Balance> {
     }
 }
 
-// TODO: this runtime constant is not support to update, see https://github.com/subspace/subspace/issues/2712
+// TODO: this runtime constant is not support to update, see https://github.com/autonomys/subspace/issues/2712
 // for more detail about the problem and what we need to do to support it.
 //
 /// Initial tx range = U256::MAX / INITIAL_DOMAIN_TX_RANGE.
@@ -724,7 +724,7 @@ pub struct ProofOfElection<CHash> {
     /// Operator index in the OperatorRegistry.
     pub operator_id: OperatorId,
     /// TODO: this field is only used in the bundle equivocation FP which is removed,
-    /// also this field is problematic see <https://github.com/subspace/subspace/issues/2737>
+    /// also this field is problematic see <https://github.com/autonomys/subspace/issues/2737>
     /// so remove this field before next network
     ///
     /// Consensus block hash at which proof of election was derived.
diff --git a/crates/sp-lightclient/Cargo.toml b/crates/sp-lightclient/Cargo.toml
index 8b75a156f2..c7dc0d5749 100644
--- a/crates/sp-lightclient/Cargo.toml
+++ b/crates/sp-lightclient/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Light client substrate primitives for Subspace"
 include = [
     "/src",
diff --git a/crates/sp-objects/Cargo.toml b/crates/sp-objects/Cargo.toml
index d595e99f89..38b2b82e03 100644
--- a/crates/sp-objects/Cargo.toml
+++ b/crates/sp-objects/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives for Objects"
 readme = "README.md"
 
diff --git a/crates/sp-subspace-mmr/Cargo.toml b/crates/sp-subspace-mmr/Cargo.toml
index e7078c4c51..5598c80b69 100644
--- a/crates/sp-subspace-mmr/Cargo.toml
+++ b/crates/sp-subspace-mmr/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sp-subspace-mmr"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives for Subspace MMR"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 version = "0.1.0"
diff --git a/crates/subspace-fake-runtime-api/Cargo.toml b/crates/subspace-fake-runtime-api/Cargo.toml
index 746ed614e6..aedff84b3d 100644
--- a/crates/subspace-fake-runtime-api/Cargo.toml
+++ b/crates/subspace-fake-runtime-api/Cargo.toml
@@ -6,7 +6,7 @@ description = "Fake subspace runtime API."
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = ["/src", "/Cargo.toml"]
 
 [package.metadata.docs.rs]
diff --git a/crates/subspace-farmer/src/disk_piece_cache.rs b/crates/subspace-farmer/src/disk_piece_cache.rs
index 64e228432c..1e9b4a8210 100644
--- a/crates/subspace-farmer/src/disk_piece_cache.rs
+++ b/crates/subspace-farmer/src/disk_piece_cache.rs
@@ -167,7 +167,7 @@ impl farm::PieceCache for DiskPieceCache {
         //  usage. No idea why it happens, but not spawning anything at all helps for some reason.
         //  Someone at some point should figure it out and fix, but it will probably be not me
         //  (Nazar).
-        //  See https://github.com/subspace/subspace/issues/2813 and linked forum post for details.
+        //  See https://github.com/autonomys/subspace/issues/2813 and linked forum post for details.
         //  This TODO exists in multiple files
         if cfg!(windows) {
             Ok(task::block_in_place(|| self.read_piece(offset))?)
diff --git a/crates/subspace-farmer/src/single_disk_farm/plot_cache.rs b/crates/subspace-farmer/src/single_disk_farm/plot_cache.rs
index 75a2ac2be8..a8851d7815 100644
--- a/crates/subspace-farmer/src/single_disk_farm/plot_cache.rs
+++ b/crates/subspace-farmer/src/single_disk_farm/plot_cache.rs
@@ -278,7 +278,7 @@ impl DiskPlotCache {
         //  usage. No idea why it happens, but not spawning anything at all helps for some reason.
         //  Someone at some point should figure it out and fix, but it will probably be not me
         //  (Nazar).
-        //  See https://github.com/subspace/subspace/issues/2813 and linked forum post for details.
+        //  See https://github.com/autonomys/subspace/issues/2813 and linked forum post for details.
         //  This TODO exists in multiple files
         let maybe_piece = if cfg!(windows) {
             task::block_in_place(read_fn)
diff --git a/crates/subspace-malicious-operator/Cargo.toml b/crates/subspace-malicious-operator/Cargo.toml
index d48b5aa99c..73aa7cf130 100644
--- a/crates/subspace-malicious-operator/Cargo.toml
+++ b/crates/subspace-malicious-operator/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later"
 build = "build.rs"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/build.rs",
diff --git a/crates/subspace-malicious-operator/src/lib.rs b/crates/subspace-malicious-operator/src/lib.rs
index def4d74581..99dd2fad54 100644
--- a/crates/subspace-malicious-operator/src/lib.rs
+++ b/crates/subspace-malicious-operator/src/lib.rs
@@ -162,7 +162,7 @@ impl SubstrateCli for DomainCli {
     }
 
     fn support_url() -> String {
-        "https://github.com/subspace/subspace/issues/new".into()
+        "https://github.com/autonomys/subspace/issues/new".into()
     }
 
     fn copyright_start_year() -> i32 {
diff --git a/crates/subspace-malicious-operator/src/malicious_bundle_tamper.rs b/crates/subspace-malicious-operator/src/malicious_bundle_tamper.rs
index 46c9ffa0ac..e6a50a633c 100644
--- a/crates/subspace-malicious-operator/src/malicious_bundle_tamper.rs
+++ b/crates/subspace-malicious-operator/src/malicious_bundle_tamper.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 const MAX_BAD_RECEIPT_CACHE: u32 = 128;
 
 // TODO: remove dead_code once the `InboxedBundle` variant is used
-// currently blocked due to https://github.com/subspace/subspace/issues/2287
+// currently blocked due to https://github.com/autonomys/subspace/issues/2287
 #[allow(dead_code)]
 #[derive(Debug)]
 enum BadReceiptType {
diff --git a/crates/subspace-networking/Cargo.toml b/crates/subspace-networking/Cargo.toml
index 32c66fe4f3..0046ac967f 100644
--- a/crates/subspace-networking/Cargo.toml
+++ b/crates/subspace-networking/Cargo.toml
@@ -9,7 +9,7 @@ description = "Networking functionality of Subspace Network, primarily used for
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/crates/subspace-networking/src/node_runner.rs b/crates/subspace-networking/src/node_runner.rs
index 56c88066c6..ec4bfa87de 100644
--- a/crates/subspace-networking/src/node_runner.rs
+++ b/crates/subspace-networking/src/node_runner.rs
@@ -246,7 +246,7 @@ where
         }
 
         // TODO: Remove once https://github.com/libp2p/rust-libp2p/issues/5432 is resolved,
-        //  downstream issue is https://github.com/subspace/subspace/issues/2729
+        //  downstream issue is https://github.com/autonomys/subspace/issues/2729
         if tokio::time::timeout(BOOTSTRAP_TIMEOUT, self.bootstrap())
             .await
             .is_err()
diff --git a/crates/subspace-node/Cargo.toml b/crates/subspace-node/Cargo.toml
index 19e951d07a..4c83546824 100644
--- a/crates/subspace-node/Cargo.toml
+++ b/crates/subspace-node/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later"
 build = "build.rs"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/res",
     "/src",
diff --git a/crates/subspace-node/src/domain/cli.rs b/crates/subspace-node/src/domain/cli.rs
index a8461797e9..767348d81c 100644
--- a/crates/subspace-node/src/domain/cli.rs
+++ b/crates/subspace-node/src/domain/cli.rs
@@ -166,7 +166,7 @@ impl SubstrateCli for DomainCli {
     }
 
     fn support_url() -> String {
-        "https://github.com/subspace/subspace/issues/new".into()
+        "https://github.com/autonomys/subspace/issues/new".into()
     }
 
     fn copyright_start_year() -> i32 {
diff --git a/crates/subspace-rpc-primitives/Cargo.toml b/crates/subspace-rpc-primitives/Cargo.toml
index 3bd06d4ced..7586d46061 100644
--- a/crates/subspace-rpc-primitives/Cargo.toml
+++ b/crates/subspace-rpc-primitives/Cargo.toml
@@ -6,7 +6,7 @@ description = "RPC primitives for Subspace Network"
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/crates/subspace-runtime-primitives/Cargo.toml b/crates/subspace-runtime-primitives/Cargo.toml
index 989c87a813..169b8e38b9 100644
--- a/crates/subspace-runtime-primitives/Cargo.toml
+++ b/crates/subspace-runtime-primitives/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/crates/subspace-runtime/Cargo.toml b/crates/subspace-runtime/Cargo.toml
index ce226198df..a1b6e92422 100644
--- a/crates/subspace-runtime/Cargo.toml
+++ b/crates/subspace-runtime/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/build.rs",
diff --git a/crates/subspace-runtime/src/lib.rs b/crates/subspace-runtime/src/lib.rs
index 3ddcbb76e7..ecf2be9111 100644
--- a/crates/subspace-runtime/src/lib.rs
+++ b/crates/subspace-runtime/src/lib.rs
@@ -371,7 +371,7 @@ impl VariantCount for HoldIdentifier {
     // many operator/channel an account can nominate/open.
     //
     // TODO: HACK this is not the actual variant count but it is required see
-    // https://github.com/subspace/subspace/issues/2674 for more details. It
+    // https://github.com/autonomys/subspace/issues/2674 for more details. It
     // will be resolved as https://github.com/paritytech/polkadot-sdk/issues/4033.
     const VARIANT_COUNT: u32 = 100;
 }
diff --git a/crates/subspace-service/Cargo.toml b/crates/subspace-service/Cargo.toml
index 222a3882c6..76fbb03119 100644
--- a/crates/subspace-service/Cargo.toml
+++ b/crates/subspace-service/Cargo.toml
@@ -6,7 +6,7 @@ description = "Subspace service."
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/crates/subspace-verification/Cargo.toml b/crates/subspace-verification/Cargo.toml
index 62744cbd3d..437a383628 100644
--- a/crates/subspace-verification/Cargo.toml
+++ b/crates/subspace-verification/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Verification primitives for Subspace"
 include = [
     "/src",
diff --git a/docs/farming.md b/docs/farming.md
index aa07fdcec8..0135b28b03 100644
--- a/docs/farming.md
+++ b/docs/farming.md
@@ -1,6 +1,6 @@
 # ⚠️ Living document
 
-**‼️ NOTE: This is a living document reflecting current state of the codebase, make sure to open this page from the [release you want to install](https://github.com/subspace/subspace/releases) and not directly ‼️**
+**‼️ NOTE: This is a living document reflecting current state of the codebase, make sure to open this page from the [release you want to install](https://github.com/autonomys/subspace/releases) and not directly ‼️**
 
 # 👨‍🌾 Getting Started Farming
 
@@ -16,7 +16,7 @@ You need 2 executables, select whichever applies to your operating system
 * Node Executable - `subspace-node-...`
 * Farmer Executable - `subspace-farmer-...`
 
-You can find these executables in the [Releases](https://github.com/subspace/subspace/releases) section of this Repository.
+You can find these executables in the [Releases](https://github.com/autonomys/subspace/releases) section of this Repository.
 
 ## Polkadot.js wallet
 
@@ -34,7 +34,7 @@ If you're connected directly without any router, then again nothing needs to be
 
 ## 🖼️ Windows Instructions
 
-1. Download the executables for your operating system from the [Releases](https://github.com/subspace/subspace/releases) tab.
+1. Download the executables for your operating system from the [Releases](https://github.com/autonomys/subspace/releases) tab.
 2. Open `Powershell` (we do not recommend using Command Prompt as its syntax is slightly different)
 3. In the terminal we will change to the Downloads directory using this command `cd Downloads`
 4. We will then start the node using the following command
@@ -84,7 +84,7 @@ If you're connected directly without any router, then again nothing needs to be
 
 ## 🐧 Ubuntu Instructions
 
-1. Download the executables for your operating system from the [Releases](https://github.com/subspace/subspace/releases) tab.
+1. Download the executables for your operating system from the [Releases](https://github.com/autonomys/subspace/releases) tab.
 2. Open your favourite terminal, and change to the Downloads directory using `cd Downloads`
 3. Make the farmer & node executable  `chmod +x farmer-name` & `chmod +X node-name`
 4. We will then start the node using the following command
@@ -133,7 +133,7 @@ If you're connected directly without any router, then again nothing needs to be
 
 ## 🍎 macOS Instructions
 
-1. Download the executables for your operating system from the [Releases](https://github.com/subspace/subspace/releases) tab and extract binaries from ZIP archives.
+1. Download the executables for your operating system from the [Releases](https://github.com/autonomys/subspace/releases) tab and extract binaries from ZIP archives.
 2. Open your favourite terminal, and change to the Downloads directory using `cd Downloads`
 3. Make the farmer & node executable  `chmod +x farmer-name` & `chmod +X node-name`
 4. We will then start the node using the following command
@@ -193,7 +193,7 @@ services:
   node:
     # Replace `snapshot-DATE` with the latest release (like `snapshot-2022-apr-29`)
     # For running on Aarch64 add `-aarch64` after `DATE`
-    image: ghcr.io/subspace/node:snapshot-DATE
+    image: ghcr.io/autonomys/node:snapshot-DATE
     volumes:
 # Instead of specifying volume (which will store data in `/var/lib/docker`), you can
 # alternatively specify path to the directory where files will be stored, just make
@@ -231,7 +231,7 @@ services:
         condition: service_healthy
     # Replace `snapshot-DATE` with latest release (like `snapshot-2022-apr-29`)
     # For running on Aarch64 add `-aarch64` after `DATE`
-    image: ghcr.io/subspace/farmer:snapshot-DATE
+    image: ghcr.io/autonomys/farmer:snapshot-DATE
     volumes:
 # Instead of specifying volume (which will store data in `/var/lib/docker`), you can
 # alternatively specify path to the directory where files will be stored, just make
@@ -273,7 +273,7 @@ You can read logs with `docker-compose logs --tail=1000 -f`, for the rest read [
 
 ## Checking results and interacting with the network
 
-Visit [Polkadot.js explorer](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Feu-0.gemini-3h.subspace.network%2Fws#/explorer), from there you can interact with Subspace Network as any Substrate-based blockchain.
+Visit [Polkadot.js explorer](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Feu-0.gemini-3h.subspace.network%2Fws#/explorer), from there you can interact with Autonomys Network as any Substrate-based blockchain.
 
 ## Switching from older/different versions of Subspace
 
@@ -341,7 +341,7 @@ Check [crates/subspace-node](../crates/subspace-node/README.md) and [crates/subs
 
 Now clone the source and build snapshot `snapshot-2022-apr-29` (replace occurrences with the snapshot you want to build):
 ```bash
-git clone https://github.com/subspace/subspace.git
+git clone https://github.com/autonomys/subspace.git
 cd subspace
 git checkout snapshot-2022-apr-29
 cargo build \
diff --git a/domains/client/block-builder/src/lib.rs b/domains/client/block-builder/src/lib.rs
index 0bceb22a78..27c5bb9196 100644
--- a/domains/client/block-builder/src/lib.rs
+++ b/domains/client/block-builder/src/lib.rs
@@ -360,7 +360,7 @@ where
     }
 }
 
-// TODO: Unlock this test, it got broken in https://github.com/subspace/subspace/pull/1548 and
+// TODO: Unlock this test, it got broken in https://github.com/autonomys/subspace/pull/1548 and
 //  doesn't run on Windows at all, also needs to not use substrate_test_runtime_client
 // #[cfg(test)]
 // mod tests {
diff --git a/domains/client/block-preprocessor/Cargo.toml b/domains/client/block-preprocessor/Cargo.toml
index bb0b89bb1a..6c9b6fb09f 100644
--- a/domains/client/block-preprocessor/Cargo.toml
+++ b/domains/client/block-preprocessor/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Domain block preprocessor"
 include = [
     "/src",
diff --git a/domains/client/cross-domain-message-gossip/Cargo.toml b/domains/client/cross-domain-message-gossip/Cargo.toml
index 70004677b8..03d191ba5f 100644
--- a/domains/client/cross-domain-message-gossip/Cargo.toml
+++ b/domains/client/cross-domain-message-gossip/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace message relayer."
 include = [
     "/src",
diff --git a/domains/client/domain-operator/src/bundle_processor.rs b/domains/client/domain-operator/src/bundle_processor.rs
index 6c47526c02..5d3e748868 100644
--- a/domains/client/domain-operator/src/bundle_processor.rs
+++ b/domains/client/domain-operator/src/bundle_processor.rs
@@ -179,7 +179,7 @@ where
         }
     }
 
-    // TODO: Handle the returned error properly, ref to https://github.com/subspace/subspace/pull/695#discussion_r926721185
+    // TODO: Handle the returned error properly, ref to https://github.com/autonomys/subspace/pull/695#discussion_r926721185
     pub(crate) async fn process_bundles(
         self,
         consensus_block_info: (CBlock::Hash, NumberFor<CBlock>, bool),
diff --git a/domains/client/domain-operator/src/domain_block_processor.rs b/domains/client/domain-operator/src/domain_block_processor.rs
index d570cb20c6..d42a29be2c 100644
--- a/domains/client/domain-operator/src/domain_block_processor.rs
+++ b/domains/client/domain-operator/src/domain_block_processor.rs
@@ -171,7 +171,7 @@ where
                 //
                 // NOTE: it is important to check the auxiliary storage first before checking if it
                 // is the genesis block otherwise we may repeatedly processing the empty consensus
-                // block, see https://github.com/subspace/subspace/issues/1763 for more detail.
+                // block, see https://github.com/autonomys/subspace/issues/1763 for more detail.
                 None if best_number.is_zero() => self
                     .consensus_client
                     .hash(self.domain_created_at)?
@@ -884,7 +884,7 @@ where
         let bad_receipt_hash = bad_receipt.hash::<HeaderHashingFor<Block::Header>>();
 
         // NOTE: the checking order MUST follow exactly as the dependency order of fraud proof
-        // see https://github.com/subspace/subspace/issues/1892
+        // see https://github.com/autonomys/subspace/issues/1892
         if let Some(InboxedBundleMismatchInfo {
             bundle_index,
             mismatch_type,
diff --git a/domains/client/domain-operator/src/domain_worker.rs b/domains/client/domain-operator/src/domain_worker.rs
index 57cd581e46..8adf6e913b 100644
--- a/domains/client/domain-operator/src/domain_worker.rs
+++ b/domains/client/domain-operator/src/domain_worker.rs
@@ -266,7 +266,7 @@ where
                     // and `blocks_importing` notification are arrived, the `block_imported` notification will be processed
                     // first, such that we can ensure when the `blocks_importing` acknowledgement is responded, the
                     // imported block must being processed by the executor.
-                    // Please see https://github.com/subspace/subspace/pull/1363#discussion_r1162571291 for more details.
+                    // Please see https://github.com/autonomys/subspace/pull/1363#discussion_r1162571291 for more details.
                     biased;
 
                     maybe_block_imported = blocks_imported.next() => {
diff --git a/domains/client/domain-operator/src/tests.rs b/domains/client/domain-operator/src/tests.rs
index 7bcf86da20..c86031f9c0 100644
--- a/domains/client/domain-operator/src/tests.rs
+++ b/domains/client/domain-operator/src/tests.rs
@@ -3987,7 +3987,7 @@ async fn test_unordered_cross_domains_message_should_work() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-// TODO: https://github.com/subspace/subspace/pull/1954 broke this on Windows, we suspect the test
+// TODO: https://github.com/autonomys/subspace/pull/1954 broke this on Windows, we suspect the test
 //  is racy, but didn't find why and why it only fails on Windows. This needs to be fixed and test
 //  un-ignored on Windows.
 #[cfg_attr(windows, ignore)]
diff --git a/domains/client/eth-service/Cargo.toml b/domains/client/eth-service/Cargo.toml
index edfb07f193..5b9d5b58ab 100644
--- a/domains/client/eth-service/Cargo.toml
+++ b/domains/client/eth-service/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Ethereum compatible core component service"
 include = [
     "/src",
diff --git a/domains/client/relayer/Cargo.toml b/domains/client/relayer/Cargo.toml
index 6452ca76e2..6a87809e3f 100644
--- a/domains/client/relayer/Cargo.toml
+++ b/domains/client/relayer/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace message relayer."
 include = [
     "/src",
diff --git a/domains/pallets/auto-id/Cargo.toml b/domains/pallets/auto-id/Cargo.toml
index 040972cbd4..377aa982fb 100644
--- a/domains/pallets/auto-id/Cargo.toml
+++ b/domains/pallets/auto-id/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Auto ID pallet"
 include = [
     "/src",
diff --git a/domains/pallets/block-fees/Cargo.toml b/domains/pallets/block-fees/Cargo.toml
index 9657c5d17a..558d0776a5 100644
--- a/domains/pallets/block-fees/Cargo.toml
+++ b/domains/pallets/block-fees/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace node pallet for charging and re-distributing domain transaction fees"
 include = [
     "/src",
diff --git a/domains/pallets/domain-id/Cargo.toml b/domains/pallets/domain-id/Cargo.toml
index 6d4b384277..74da7e46b9 100644
--- a/domains/pallets/domain-id/Cargo.toml
+++ b/domains/pallets/domain-id/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace node pallet to store domain id."
 include = [
     "/src",
diff --git a/domains/pallets/domain-sudo/Cargo.toml b/domains/pallets/domain-sudo/Cargo.toml
index 3b9dc2b4fa..0ed90f5628 100644
--- a/domains/pallets/domain-sudo/Cargo.toml
+++ b/domains/pallets/domain-sudo/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Domain sudo pallet"
 include = [
     "/src",
diff --git a/domains/pallets/evm_nonce_tracker/Cargo.toml b/domains/pallets/evm_nonce_tracker/Cargo.toml
index d9f2ca9839..d12f7ecdd2 100644
--- a/domains/pallets/evm_nonce_tracker/Cargo.toml
+++ b/domains/pallets/evm_nonce_tracker/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace node pallet for EVM account nonce tracker."
 include = [
     "/src",
diff --git a/domains/pallets/executive/Cargo.toml b/domains/pallets/executive/Cargo.toml
index 9ec30b07b1..dc5e1535df 100644
--- a/domains/pallets/executive/Cargo.toml
+++ b/domains/pallets/executive/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>", "Subspace Labs <admin@subspa
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace/"
+repository = "https://github.com/autonomys/subspace/"
 description = "Cirrus executives engine"
 
 [package.metadata.docs.rs]
diff --git a/domains/pallets/messenger/Cargo.toml b/domains/pallets/messenger/Cargo.toml
index 03c0135c52..7ee0939050 100644
--- a/domains/pallets/messenger/Cargo.toml
+++ b/domains/pallets/messenger/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace node pallet for cross domain and cross chain messaging"
 include = [
     "/src",
diff --git a/domains/pallets/transporter/Cargo.toml b/domains/pallets/transporter/Cargo.toml
index 2769095644..71e1f2445e 100644
--- a/domains/pallets/transporter/Cargo.toml
+++ b/domains/pallets/transporter/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Subspace node pallet to move funds between domains."
 include = [
     "/src",
diff --git a/domains/primitives/auto-id/Cargo.toml b/domains/primitives/auto-id/Cargo.toml
index 6a42d6b901..d554377077 100644
--- a/domains/primitives/auto-id/Cargo.toml
+++ b/domains/primitives/auto-id/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives for AutoId"
 include = [
     "/src",
diff --git a/domains/primitives/block-fees/Cargo.toml b/domains/primitives/block-fees/Cargo.toml
index e5ea931062..c75e1c7480 100644
--- a/domains/primitives/block-fees/Cargo.toml
+++ b/domains/primitives/block-fees/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives of pallet block-fees"
 include = [
     "/src",
diff --git a/domains/primitives/digests/Cargo.toml b/domains/primitives/digests/Cargo.toml
index 4f7e796ced..090c9f471b 100644
--- a/domains/primitives/digests/Cargo.toml
+++ b/domains/primitives/digests/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives of domain related digests"
 include = [
     "/src",
diff --git a/domains/primitives/domain-sudo/Cargo.toml b/domains/primitives/domain-sudo/Cargo.toml
index 304e0fd82a..5ea8bfb3b2 100644
--- a/domains/primitives/domain-sudo/Cargo.toml
+++ b/domains/primitives/domain-sudo/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives of pallet domain sudo"
 include = [
     "/src",
diff --git a/domains/primitives/executive/Cargo.toml b/domains/primitives/executive/Cargo.toml
index fbd66be517..b3a268fc2d 100644
--- a/domains/primitives/executive/Cargo.toml
+++ b/domains/primitives/executive/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives of pallet executive"
 include = [
     "/src",
diff --git a/domains/primitives/messenger-host-functions/Cargo.toml b/domains/primitives/messenger-host-functions/Cargo.toml
index dab91e17a1..27d1e2296a 100644
--- a/domains/primitives/messenger-host-functions/Cargo.toml
+++ b/domains/primitives/messenger-host-functions/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Host functions for Messenger"
 include = [
     "/src",
diff --git a/domains/primitives/messenger/Cargo.toml b/domains/primitives/messenger/Cargo.toml
index b66cc4b4be..35acc67415 100644
--- a/domains/primitives/messenger/Cargo.toml
+++ b/domains/primitives/messenger/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vedhavyas Singareddi <ved@subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Primitives for Messenger"
 include = [
     "/src",
diff --git a/domains/primitives/runtime/Cargo.toml b/domains/primitives/runtime/Cargo.toml
index 6a2e380bff..625622e2cd 100644
--- a/domains/primitives/runtime/Cargo.toml
+++ b/domains/primitives/runtime/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 description = "Common primitives of subspace domain runtime"
 
 [package.metadata.docs.rs]
diff --git a/domains/runtime/auto-id/Cargo.toml b/domains/runtime/auto-id/Cargo.toml
index 88ea14d9cd..8bc5bbb14c 100644
--- a/domains/runtime/auto-id/Cargo.toml
+++ b/domains/runtime/auto-id/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vedhavyas Singareddi<ved@subspace.network>"]
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace/"
+repository = "https://github.com/autonomys/subspace/"
 edition = "2021"
 description = "Subspace AutoId domain runtime"
 include = [
diff --git a/domains/runtime/auto-id/src/lib.rs b/domains/runtime/auto-id/src/lib.rs
index 5f67f2ad70..2469d48f77 100644
--- a/domains/runtime/auto-id/src/lib.rs
+++ b/domains/runtime/auto-id/src/lib.rs
@@ -384,7 +384,7 @@ impl VariantCount for HoldIdentifier {
     // also used as the limit of how many channel an account can open.
     //
     // TODO: HACK this is not the actual variant count but it is required see
-    // https://github.com/subspace/subspace/issues/2674 for more details. It
+    // https://github.com/autonomys/subspace/issues/2674 for more details. It
     // will be resolved as https://github.com/paritytech/polkadot-sdk/issues/4033.
     const VARIANT_COUNT: u32 = 100;
 }
diff --git a/domains/runtime/evm/Cargo.toml b/domains/runtime/evm/Cargo.toml
index a85a3e3b90..e58dfdec4c 100644
--- a/domains/runtime/evm/Cargo.toml
+++ b/domains/runtime/evm/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vedhavyas Singareddi<ved@subspace.network>, Liu-Cheng Xu <xuliuchengxlc@gmail.com>"]
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace/"
+repository = "https://github.com/autonomys/subspace/"
 edition = "2021"
 description = "Subspace EVM domain runtime"
 include = [
diff --git a/domains/runtime/evm/src/lib.rs b/domains/runtime/evm/src/lib.rs
index fdf596702b..59459bbd06 100644
--- a/domains/runtime/evm/src/lib.rs
+++ b/domains/runtime/evm/src/lib.rs
@@ -513,7 +513,7 @@ impl VariantCount for HoldIdentifier {
     // also used as the limit of how many channel an account can open.
     //
     // TODO: HACK this is not the actual variant count but it is required see
-    // https://github.com/subspace/subspace/issues/2674 for more details. It
+    // https://github.com/autonomys/subspace/issues/2674 for more details. It
     // will be resolved as https://github.com/paritytech/polkadot-sdk/issues/4033.
     const VARIANT_COUNT: u32 = 100;
 }
diff --git a/domains/test/primitives/Cargo.toml b/domains/test/primitives/Cargo.toml
index 7c346eb619..f4ba92e0b7 100644
--- a/domains/test/primitives/Cargo.toml
+++ b/domains/test/primitives/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/domains/test/runtime/auto-id/Cargo.toml b/domains/test/runtime/auto-id/Cargo.toml
index 38a2e2dcb7..8378a52f54 100644
--- a/domains/test/runtime/auto-id/Cargo.toml
+++ b/domains/test/runtime/auto-id/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Subspace Labs <https://subspace.network>"]
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace/"
+repository = "https://github.com/autonomys/subspace/"
 edition = "2021"
 description = "Subspace AutoId domain test runtime"
 include = [
diff --git a/domains/test/runtime/auto-id/src/lib.rs b/domains/test/runtime/auto-id/src/lib.rs
index 167d024d74..09a8b226bd 100644
--- a/domains/test/runtime/auto-id/src/lib.rs
+++ b/domains/test/runtime/auto-id/src/lib.rs
@@ -382,7 +382,7 @@ impl VariantCount for HoldIdentifier {
     // also used as the limit of how many channel an account can open.
     //
     // TODO: HACK this is not the actual variant count but it is required see
-    // https://github.com/subspace/subspace/issues/2674 for more details. It
+    // https://github.com/autonomys/subspace/issues/2674 for more details. It
     // will be resolved as https://github.com/paritytech/polkadot-sdk/issues/4033.
     const VARIANT_COUNT: u32 = 100;
 }
diff --git a/domains/test/runtime/evm/Cargo.toml b/domains/test/runtime/evm/Cargo.toml
index f720e36789..7fc378d837 100644
--- a/domains/test/runtime/evm/Cargo.toml
+++ b/domains/test/runtime/evm/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Vedhavyas Singareddi<ved@subspace.network>, Liu-Cheng Xu <xuliuchengxlc@gmail.com>"]
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace/"
+repository = "https://github.com/autonomys/subspace/"
 edition = "2021"
 description = "Subspace EVM domain runtime"
 include = [
diff --git a/domains/test/runtime/evm/src/lib.rs b/domains/test/runtime/evm/src/lib.rs
index b7bd7c16bc..e87c2ec553 100644
--- a/domains/test/runtime/evm/src/lib.rs
+++ b/domains/test/runtime/evm/src/lib.rs
@@ -473,7 +473,7 @@ pub enum HoldIdentifier {
 
 impl VariantCount for HoldIdentifier {
     // TODO: HACK this is not the actual variant count but it is required see
-    // https://github.com/subspace/subspace/issues/2674 for more details. It
+    // https://github.com/autonomys/subspace/issues/2674 for more details. It
     // will be resolved as https://github.com/paritytech/polkadot-sdk/issues/4033.
     const VARIANT_COUNT: u32 = 10;
 }
diff --git a/domains/test/service/Cargo.toml b/domains/test/service/Cargo.toml
index d7bdcef5ef..0a90edb411 100644
--- a/domains/test/service/Cargo.toml
+++ b/domains/test/service/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/shared/subspace-metrics/Cargo.toml b/shared/subspace-metrics/Cargo.toml
index 6e461e900d..f69e40535b 100644
--- a/shared/subspace-metrics/Cargo.toml
+++ b/shared/subspace-metrics/Cargo.toml
@@ -8,7 +8,7 @@ authors = [
 description = "Metrics for Subspace Network"
 license = "Apache-2.0"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/test/subspace-test-client/Cargo.toml b/test/subspace-test-client/Cargo.toml
index 7eedf537bc..f2f2238788 100644
--- a/test/subspace-test-client/Cargo.toml
+++ b/test/subspace-test-client/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/test/subspace-test-primitives/Cargo.toml b/test/subspace-test-primitives/Cargo.toml
index 43dbc06531..96be694df0 100644
--- a/test/subspace-test-primitives/Cargo.toml
+++ b/test/subspace-test-primitives/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",
diff --git a/test/subspace-test-runtime/Cargo.toml b/test/subspace-test-runtime/Cargo.toml
index 4272c460bd..17c96c23b7 100644
--- a/test/subspace-test-runtime/Cargo.toml
+++ b/test/subspace-test-runtime/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/build.rs",
diff --git a/test/subspace-test-runtime/src/lib.rs b/test/subspace-test-runtime/src/lib.rs
index b9aa640332..04b4877af2 100644
--- a/test/subspace-test-runtime/src/lib.rs
+++ b/test/subspace-test-runtime/src/lib.rs
@@ -356,7 +356,7 @@ impl pallet_messenger::HoldIdentifier<Runtime> for HoldIdentifier {
 
 impl VariantCount for HoldIdentifier {
     // TODO: HACK this is not the actual variant count but it is required see
-    // https://github.com/subspace/subspace/issues/2674 for more details. It
+    // https://github.com/autonomys/subspace/issues/2674 for more details. It
     // will be resolved as https://github.com/paritytech/polkadot-sdk/issues/4033.
     const VARIANT_COUNT: u32 = 10;
 }
diff --git a/test/subspace-test-service/Cargo.toml b/test/subspace-test-service/Cargo.toml
index e8f9c4c578..c2a555d751 100644
--- a/test/subspace-test-service/Cargo.toml
+++ b/test/subspace-test-service/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Subspace Labs <https://subspace.network>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://subspace.network"
-repository = "https://github.com/subspace/subspace"
+repository = "https://github.com/autonomys/subspace"
 include = [
     "/src",
     "/Cargo.toml",