diff --git a/content/md/en/docs/build/build-process.md b/content/md/en/docs/build/build-process.md
index 9f6ed64e3..49e13cff8 100644
--- a/content/md/en/docs/build/build-process.md
+++ b/content/md/en/docs/build/build-process.md
@@ -118,7 +118,7 @@ For example, you might want to use the native runtime for initial synchronizatio
 To use the native runtime for synchronizing blocks, you can start the node using the `--execution-syncing native` or `--execution-syncing native-else-wasm` command-line option.
 
 For information about using the command-line options to specify an execution strategy for all or specific operations, see [node-template](/reference/command-line-tools/node-template).
-For information about the execution strategy variant, see [ExecutionStrategy](https://paritytech.github.io/substrate/master/sp_state_machine/enum.ExecutionStrategy.html)
+For information about the execution strategy variant, see [ExecutionStrategy](https://paritytech.github.io/substrate/master/sc_cli/arg_enums/enum.ExecutionStrategy.html)
 
 ## Building WebAssembly without a native runtime
 
diff --git a/content/md/en/docs/build/runtime-storage.md b/content/md/en/docs/build/runtime-storage.md
index 787a190d0..c0537e8fe 100644
--- a/content/md/en/docs/build/runtime-storage.md
+++ b/content/md/en/docs/build/runtime-storage.md
@@ -132,7 +132,7 @@ Refer to the [StorageMap](https://paritytech.github.io/substrate/master/frame_su
 
 ## Double key storage maps
 
-[DoubleStorageMap](https://paritytech.github.io/substrate/master/frame_support/storage/trait.StorageDoubleMap.html) storage items are similar to single key storage maps except that they contain two keys.
+[StorageDoubleMap](https://paritytech.github.io/substrate/master/frame_support/storage/trait.StorageDoubleMap.html) storage items are similar to single key storage maps except that they contain two keys.
 Using this type of storage structure is useful for querying values with common keys.
 
 ## Multi-key storage maps
diff --git a/content/md/en/docs/build/tx-weights-fees.md b/content/md/en/docs/build/tx-weights-fees.md
index 1fbcb456e..2dafa41f4 100644
--- a/content/md/en/docs/build/tx-weights-fees.md
+++ b/content/md/en/docs/build/tx-weights-fees.md
@@ -107,7 +107,7 @@ To account for this variability, the Transaction Payment pallet provides the [`F
 The default update function is inspired by the Polkadot network and implements a targeted adjustment in which a target saturation level of block weight is defined.
 If the previous block is more saturated, then the fees are slightly increased.
 Similarly, if the previous block has fewer transactions than the target, fees are decreased by a small amount.
-For more information about fee multiplier adjustments, see the [Web3 research page](https://w3f-research.readthedocs.io/en/latest/polkadot/overview/2-token-economics.html#relay-chain-transaction-fees-and-per-block-transaction-limits).
+For more information about fee multiplier adjustments, see the [Web3 research page](https://research.web3.foundation/Polkadot/overview/token-economics#relay-chain-transaction-fees-and-per-block-transaction-limits).
 
 ## Transactions with special requirements
 
@@ -398,6 +398,6 @@ You can use Substrate **benchmarking functions** and `frame-benchmarking` calls
 - [Benchmark](/test/benchmark/)
 - [SignedExtension](https://paritytech.github.io/substrate/master/sp_runtime/traits/trait.SignedExtension.html)
 - [Custom weights for the Example pallet](https://github.com/paritytech/substrate/blob/master/frame/examples/basic/src/weights.rs)
-- [Web3 Foundation Research](https://w3f-research.readthedocs.io/en/latest/polkadot/overview/2-token-economics.html#relay-chain-transaction-fees-and-per-block-transaction-limits)
+- [Web3 Foundation Research](https://research.web3.foundation/Polkadot/overview/token-economics#relay-chain-transaction-fees-and-per-block-transaction-limits)
 
 <!-- - [Calculate weight](/reference/how-to-guides/weights/) -->
diff --git a/content/md/en/docs/deploy/deployment-options.md b/content/md/en/docs/deploy/deployment-options.md
index c6eab9373..c73588238 100644
--- a/content/md/en/docs/deploy/deployment-options.md
+++ b/content/md/en/docs/deploy/deployment-options.md
@@ -412,7 +412,7 @@ ENTRYPOINT ["/usr/local/bin/node-template"]
 
 ### Automated build pipeline
 
-The following sample [GitHub action](https://github.com/substrate-developer-hub/substrate-node-template/blob/main/.github/workflows/build-publish-image.yml) builds and publishes a Docker image to DockerHub.
+The following sample GitHub action builds and publishes a Docker image to DockerHub.
 In most cases, you trigger this action using a manual workflow or when a new release is published.
 
 Note that you must add secrets to your GitHub repository or organization as described in [Encrypted secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets) to publish images securely.
diff --git a/content/md/en/docs/learn/consensus.md b/content/md/en/docs/learn/consensus.md
index 6227d21ef..b8b81b6b4 100644
--- a/content/md/en/docs/learn/consensus.md
+++ b/content/md/en/docs/learn/consensus.md
@@ -133,5 +133,5 @@ See [AlephBFT](https://github.com/aleph-zero-foundation/aleph-node) for such an
 
 ## Where to go next
 
-- [BABE research](https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html)
-- [GRANDPA research](https://research.web3.foundation/en/latest/polkadot/finality.html)
+- [BABE research](https://research.web3.foundation/Polkadot/protocols/block-production/Babe)
+- [GRANDPA research](https://research.web3.foundation/Polkadot/protocols/finality)
diff --git a/content/md/en/docs/learn/cryptography.md b/content/md/en/docs/learn/cryptography.md
index bebb07614..f1def1e5c 100644
--- a/content/md/en/docs/learn/cryptography.md
+++ b/content/md/en/docs/learn/cryptography.md
@@ -92,12 +92,12 @@ It is carefully engineered at several levels of design and implementation to ach
 
 #### SR25519
 
-[SR25519](https://research.web3.foundation/en/latest/polkadot/keys/1-accounts-more.html) is based on the same underlying curve as [Ed25519](#ed25519).
+[SR25519](https://research.web3.foundation/Polkadot/security/keys#account-keys) is based on the same underlying curve as [Ed25519](#ed25519).
 However, it uses Schnorr signatures instead of the EdDSA scheme.
 
 ## Where to go next
 
 - [Cryptography on Polkadot](https://wiki.polkadot.network/docs/en/learn-cryptography).
-- [Research at W3F: Cryptography](https://research.web3.foundation/en/latest/crypto.html).
+- [Research at W3F: Cryptography](https://research.web3.foundation/crypto).
 - [`Hash`](https://paritytech.github.io/substrate/master/sp_runtime/traits/trait.Hash.html) trait for implementing new hashing algorithms.
 - [`Pair`](https://paritytech.github.io/substrate/master/sp_core/crypto/trait.Pair.html) trait for implementing new cryptographic schemes.
diff --git a/content/md/en/docs/reference/command-line-tools/srtool.md b/content/md/en/docs/reference/command-line-tools/srtool.md
index 0fe0af8d9..69fbee089 100644
--- a/content/md/en/docs/reference/command-line-tools/srtool.md
+++ b/content/md/en/docs/reference/command-line-tools/srtool.md
@@ -148,7 +148,7 @@ You can use the following command-line options with the `srtool build` command.
 
 ### Examples
 
-To build the Westmint runtime from the `cumulus` repository where the path to the `Cargo.toml` for the runtime is [parachains/runtimes/assets/westmint](https://github.com/paritytech/cumulus/tree/master/parachains/runtimes/assets/westmint), you would run the following command:
+To build the Westmint runtime from the `cumulus` repository where the path to the `Cargo.toml` for the runtime is [parachains/runtimes/assets/westmint](https://github.com/paritytech/cumulus/tree/master/parachains/runtimes/assets/asset-hub-westend), you would run the following command:
 
 ```bash
 srtool build --app --package westmint-runtime --runtime-dir parachains/runtimes/assets/westmint
diff --git a/content/md/en/docs/reference/command-line-tools/subxt.md b/content/md/en/docs/reference/command-line-tools/subxt.md
index bc0ecda02..d444172ab 100644
--- a/content/md/en/docs/reference/command-line-tools/subxt.md
+++ b/content/md/en/docs/reference/command-line-tools/subxt.md
@@ -12,7 +12,7 @@ The `subxt-cli` tool enables you to perform two key tasks that are critical to u
 * You can use the `subxt-cli` tool to generate the runtime API code from the metadata from any target Substrate node.
 
 You can use the `subxt` library and `subxt-cli` tool for any node that uses metadata v14 and later.
-For examples of how to use the `subxt` library, see the [examples](https://github.com/paritytech/subxt/tree/master/examples/examples) folder.
+For examples of how to use the `subxt` library, see the [examples](https://github.com/paritytech/subxt/tree/master/examples) folder.
 
 ## Installation
 
diff --git a/content/md/en/docs/reference/frame-macros.md b/content/md/en/docs/reference/frame-macros.md
index 970cd1c32..b2c576321 100644
--- a/content/md/en/docs/reference/frame-macros.md
+++ b/content/md/en/docs/reference/frame-macros.md
@@ -392,9 +392,9 @@ $vis type $StorageName<$some_generic> $optional_where_clause
 
 For more information, see the Rust documentation for [pallet::storage](https://paritytech.github.io/substrate/master/frame_support/attr.pallet.html#storage-palletstorage-optional) and the following storage data structures:
 
-- [StorageDoubleMap](https://paritytech.github.io/substrate/master/frame_support/pallet_prelude/struct.StorageDoubleMap.html)
-- [StorageMap](https://paritytech.github.io/substrate/master/frame_support/pallet_prelude/struct.StorageMap.html#implementations)
-- [StorageValue](https://paritytech.github.io/substrate/master/frame_support/pallet_prelude/struct.StorageValue.html)
+- [StorageDoubleMap](https://paritytech.github.io/substrate/master/frame_support/storage/types/struct.StorageDoubleMap.html)
+- [StorageMap](https://paritytech.github.io/substrate/master/frame_support/storage/trait.StorageMap.html#implementors)
+- [StorageValue](https://paritytech.github.io/substrate/master/frame_support/storage/trait.StorageValue.html)
 
 ### #[pallet::type_value]
 
diff --git a/content/md/en/docs/reference/glossary.md b/content/md/en/docs/reference/glossary.md
index dadb904c6..720628c43 100644
--- a/content/md/en/docs/reference/glossary.md
+++ b/content/md/en/docs/reference/glossary.md
@@ -74,7 +74,7 @@ A [block authoring](#author) protocol similar to [Aura](#aura).
 However, with the blind assignment of blockchain extension (BABE) protocol, [authorities](#authority) win [slots](#slot) based on a verifiable random function (VRF) as opposed to the round-robin selection method.
 The winning authority can select a chain and submit a new block for it.
 
-Learn more about BABE by referring to its [official Web3 Foundation research document](https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html).
+Learn more about BABE by referring to its [official Web3 Foundation research document](https://research.web3.foundation/Polkadot/protocols/block-production/Babe).
 
 ## block
 
diff --git a/content/md/en/docs/reference/how-to-guides/consensus-models/create-a-hybrid-node.md b/content/md/en/docs/reference/how-to-guides/consensus-models/create-a-hybrid-node.md
index 0fedff806..2873c0fb8 100644
--- a/content/md/en/docs/reference/how-to-guides/consensus-models/create-a-hybrid-node.md
+++ b/content/md/en/docs/reference/how-to-guides/consensus-models/create-a-hybrid-node.md
@@ -29,7 +29,7 @@ Customize the consensus mechanisms of a Substrate chain.
 We begin by creating the block import for Grandpa.
 In addition to the block import itself, we get back a `grandpa_link`.
 This link is a channel over which the block import can communicate with the background task that actually casts Grandpa votes.
-The [details of the Grandpa protocol](https://research.web3.foundation/en/latest/polkadot/finality.html) are beyond the scope of this guide.
+The [details of the Grandpa protocol](https://research.web3.foundation/Polkadot/protocols/finality) are beyond the scope of this guide.
 
 In `node/src/service.rs`, create the Grandpa block import:
 
diff --git a/content/md/en/docs/reference/how-to-guides/pallet-design/implement-lockable-currency.md b/content/md/en/docs/reference/how-to-guides/pallet-design/implement-lockable-currency.md
index b81c7089c..df21da3e2 100644
--- a/content/md/en/docs/reference/how-to-guides/pallet-design/implement-lockable-currency.md
+++ b/content/md/en/docs/reference/how-to-guides/pallet-design/implement-lockable-currency.md
@@ -9,7 +9,7 @@ keywords:
 ---
 
 This guide shows you how to write a pallet that allows users to lock funds for staking and voting.
-The [`LockableCurrency`](https://paritytech.github.io/substrate/master/frame_support/traits/trait.LockableCurrency.html) trait is useful in the context of economic systems that enforce accountability by collateralizing fungible resources.
+The [`LockableCurrency`](https://paritytech.github.io/substrate/master/frame_support/traits/tokens/currency/trait.LockableCurrency.html) trait is useful in the context of economic systems that enforce accountability by collateralizing fungible resources.
 You can use the Substrate [staking pallet](https://paritytech.github.io/substrate/master/pallet_staking/index.html) to manage locked funds in time-based increments.
 
 In this guide, we will implement the `set_lock`, `extend_lock` and `remove_lock` methods in our own custom pallet.
@@ -22,7 +22,7 @@ You can use the template pallet in the [node template](https://github.com/substr
 
 ## Declare the necessary dependencies
 
-The methods from [`LockableCurrency`](https://paritytech.github.io/substrate/master/frame_support/traits/trait.LockableCurrency.html) require us to import a few traits from `frame_support`.
+The methods from [`LockableCurrency`](https://paritytech.github.io/substrate/master/frame_support/traits/tokens/currency/trait.LockableCurrency.html) require us to import a few traits from `frame_support`.
 
 1. Ensure you have the following traits imported in the top section of your pallet:
 
@@ -162,5 +162,5 @@ The required methods are:
 ## Related material
 
 - [Currency trait](https://paritytech.github.io/substrate/master/frame_support/traits/tokens/currency/trait.Currency.html)
-- [LockableCurrency](https://paritytech.github.io/substrate/master/frame_support/traits/trait.LockableCurrency.html)
-- [LockIdentifier](https://paritytech.github.io/substrate/master/frame_support/traits/type.LockIdentifier.html)
+- [LockableCurrency](https://paritytech.github.io/substrate/master/frame_support/traits/tokens/currency/trait.LockableCurrency.html)
+- [LockIdentifier](https://paritytech.github.io/substrate/master/frame_support/traits/index.html#reexport.LockIdentifier)
diff --git a/content/md/en/docs/tutorials/build-application-logic/use-macros-in-a-custom-pallet.md b/content/md/en/docs/tutorials/build-application-logic/use-macros-in-a-custom-pallet.md
index 185b04fa6..60fc4ccc7 100644
--- a/content/md/en/docs/tutorials/build-application-logic/use-macros-in-a-custom-pallet.md
+++ b/content/md/en/docs/tutorials/build-application-logic/use-macros-in-a-custom-pallet.md
@@ -228,7 +228,7 @@ To implement the errors for the proof-of-existence pallet:
 
 To add a new claim to the blockchain, the proof-of-existence pallet requires a storage mechanism.
 To address this requirement, you can create a key-value map, where each claim points to the owner and the block number when the claim was made.
-To create this key-value map, you can use the FRAME [`StorageMap`](https://paritytech.github.io/substrate/master/frame_support/pallet_prelude/struct.StorageMap.html).
+To create this key-value map, you can use the FRAME [`StorageMap`](https://paritytech.github.io/substrate/master/frame_support/storage/types/struct.StorageMap.html).
 
 To implement storage for the proof-of-existence pallet:
 
diff --git a/content/md/en/docs/tutorials/collectibles-workshop/01-prepare.md b/content/md/en/docs/tutorials/collectibles-workshop/01-prepare.md
index 3f9b7b990..45a931a61 100644
--- a/content/md/en/docs/tutorials/collectibles-workshop/01-prepare.md
+++ b/content/md/en/docs/tutorials/collectibles-workshop/01-prepare.md
@@ -58,7 +58,7 @@ If you don't have a preferred IDE, Visual Studio Code is a good choice.
 To interact with the blockchain and test your work as you build the Substrate collectibles application, you'll need a browser-based application that can connect to the Substrate node.
 For the workshop, you can connect to the node from the [Polkadot/Substrate Portal](https://polkadot.js.org/apps/) if you have Chrome or a Chromium-based browser.
 
-- [ ] [Google Chrome](https://www.google.com/chrome/) or a Chromium-based browser, such as [Brave](https://brave.com/download/), [Microsoft Edge](https://www.microsoft.com/en-us/edge?form=MA13FJ&exp=e00), [Opera](https://www.opera.com/download), or [Vivaldi](https://vivaldi.com/download/).
+- [ ] [Google Chrome](https://www.google.com/chrome/) or a Chromium-based browser, such as [Brave](https://brave.com/download/), [Microsoft Edge](https://www.microsoft.com/en-us/edge?form=MA13FJ&exp=e00), [Opera](https://www.opera.com/download), or [Vivaldi](https://vivaldi.com/download/). <!-- markdown-link-check-disable-line -->
 
 If you use a more restrictive browser—such as Firefox—you might find that connections between the Polkadot/Substrate Portal and the node are blocked for security or privacy reasons.
 
diff --git a/content/md/en/docs/tutorials/integrate-with-tools/integrate-a-light-client-node.md b/content/md/en/docs/tutorials/integrate-with-tools/integrate-a-light-client-node.md
index 146f7537a..96080c213 100644
--- a/content/md/en/docs/tutorials/integrate-with-tools/integrate-a-light-client-node.md
+++ b/content/md/en/docs/tutorials/integrate-with-tools/integrate-a-light-client-node.md
@@ -170,7 +170,7 @@ The primary difference in the code is that you must explicitly identify the chai
 
 To connect to Statemint:
 
-1. Download the custom chain specification file from the [cumulus repository](https://github.com/paritytech/cumulus/blob/master/parachains/chain-specs/statemint.json).
+1. Download the custom chain specification file from the [cumulus repository](https://github.com/paritytech/cumulus/blob/master/parachains/chain-specs/asset-hub-polkadot.json).
 
 2. Copy the downloaded chain specification to the `empty-webapp` directory you created in [Connect to a well-known chain](#connect-to-a-well-known-chain).
 
diff --git a/plugins/gatsby-plugin-substrate b/plugins/gatsby-plugin-substrate
index ae6287327..798d7c609 160000
--- a/plugins/gatsby-plugin-substrate
+++ b/plugins/gatsby-plugin-substrate
@@ -1 +1 @@
-Subproject commit ae62873274a4d24fe1fbfcaf9af8a2218594445b
+Subproject commit 798d7c609fa30f9c1f81f795b6862d9debe64c01