diff --git a/nginx/includes/redirects.conf b/nginx/includes/redirects.conf
index 8e126b8a..b8a65eb3 100644
--- a/nginx/includes/redirects.conf
+++ b/nginx/includes/redirects.conf
@@ -1,17 +1,17 @@
 rewrite "^/docs/category/examples$" "https://developers.stellar.org/docs/smart-contracts/example-contracts" permanent;
-rewrite "^/docs/getting-started/run-rpc$" "https://developers.stellar.org/network/soroban-rpc/admin-guide" permanent;
+rewrite "^/docs/getting-started/run-rpc$" "https://developers.stellar.org/docs/data/rpc/admin-guide" permanent;
 rewrite "^/docs/category/tutorials$" "https://developers.stellar.org/docs/smart-contracts/example-contracts" permanent;
 rewrite "^/docs/tutorials/deploy-to-futurenet$" "https://developers.stellar.org/docs/smart-contracts/getting-started/deploy-to-testnet" permanent;
-rewrite "^/fundamentals-and-concepts/faq$" "https://developers.stellar.org/docs/smart-contracts/faq" permanent;
+rewrite "^/fundamentals-and-concepts/faq$" "https://developers.stellar.org" permanent;
 rewrite "^/docs/examples/events$" "https://developers.stellar.org/docs/smart-contracts/example-contracts/events" permanent;
-rewrite "^/docs/learn/rust-dialect$" "https://developers.stellar.org/docs/learn/smart-contract-internals/rust-dialect" permanent;
+rewrite "^/docs/learn/rust-dialect$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development/rust-dialect" permanent;
 rewrite "^/docs/advanced-tutorials/liquidity-pool-b6f$" "https://developers.stellar.org/docs/smart-contracts/example-contracts/liquidity-pool" permanent;
-rewrite "^/docs(/category)?/learn$" "https://developers.stellar.org/docs/learn/smart-contract-internals" permanent;
-rewrite "^/docs/category/fundamentals-and-concepts$" "https://developers.stellar.org/docs/learn/smart-contract-internals" permanent;
+rewrite "^/docs(/category)?/learn$" "https://developers.stellar.org/docs/learn" permanent;
+rewrite "^/docs/category/fundamentals-and-concepts$" "https://developers.stellar.org/docs/learn/fundamentals" permanent;
 rewrite "^/docs/built-in-contracts/token$" "https://developers.stellar.org/docs/smart-contracts/tokens/stellar-asset-contract" permanent;
 rewrite "^/docs/getting-started/deploy-to-a-local-network$" "https://developers.stellar.org/docs/smart-contracts/getting-started/deploy-to-testnet" permanent;
 rewrite "^/docs/getting-started/deploy-to-futurenet$" "https://developers.stellar.org/docs/smart-contracts/getting-started/deploy-to-testnet" permanent;
-rewrite "^/docs/tutorials/testing$" "https://developers.stellar.org/docs/learn/smart-contract-internals/debugging" permanent;
+rewrite "^/docs/tutorials/testing$" "https://developers.stellar.org/docs/learn/encyclopedia/errors-and-debugging/debugging" permanent;
 rewrite "^/docs/category/how-to-guides$" "https://developers.stellar.org/docs/smart-contracts/guides" permanent;
 rewrite "^/docs/getting-started/connect-freighter-wallet$" "https://developers.stellar.org/docs/smart-contracts/guides/freighter" permanent;
 rewrite "^/docs/common-interfaces/token$" "https://developers.stellar.org/docs/smart-contracts/tokens/token-interface" permanent;
@@ -26,14 +26,14 @@ rewrite "^/docs/tutorials/stellar-asset-contract" "https://developers.stellar.or
 rewrite "^/docs/category/migrating-from-evm$" "https://developers.stellar.org/docs/learn/migrate/evm" permanent;
 rewrite "^/docs/fundamentals-and-concepts/migrating-from-evm(/.*)$" "https://developers.stellar.org/docs/learn/migrate/evm$1" permanent;
 rewrite "^/docs/reference/releases$" "https://developers.stellar.org/docs/reference/software-versions" permanent;
-rewrite "^/docs/fundamentals-and-concepts/faq$" "https://developers.stellar.org/docs/smart-contracts/faq" permanent;
+rewrite "^/docs/fundamentals-and-concepts/faq$" "https://developers.stellar.org" permanent;
 rewrite "^/docs/reference/testnet$" "https://developers.stellar.org/docs/reference/networks" permanent;
-rewrite "^/docs/fundamentals-and-concepts/(built-in-types|custom-types|fully-typed-contracts)$" "https://developers.stellar.org/docs/learn/smart-contract-internals/types/$1" permanent;
-rewrite "^/docs/fundamentals-and-concepts/invoking-contracts-with-transactions$" "https://developers.stellar.org/docs/learn/smart-contract-internals/contract-interactions/stellar-transaction" permanent;
-rewrite "^/docs/soroban-internals/contract-interactions/stellar-transactions$" "https://developers.stellar.org/docs/learn/smart-contract-internals/contract-interactions/stellar-transaction" permanent;
-rewrite "^/docs/fundamentals-and-concepts/interacting-with-contracts$" "https://developers.stellar.org/docs/learn/smart-contract-internals/contract-interactions" permanent;
+rewrite "^/docs/fundamentals-and-concepts/(built-in-types|custom-types|fully-typed-contracts)$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development/types/$1" permanent;
+rewrite "^/docs/fundamentals-and-concepts/invoking-contracts-with-transactions$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development/contract-interactions/stellar-transaction" permanent;
+rewrite "^/docs/soroban-internals/contract-interactions/stellar-transactions$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development/contract-interactions/stellar-transaction" permanent;
+rewrite "^/docs/fundamentals-and-concepts/interacting-with-contracts$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development/contract-interactions" permanent;
 rewrite "^/docs/(basic|advanced)-tutorials(/.*)$" "https://developers.stellar.org/docs/smart-contracts/example-contracts$2" permanent;
-rewrite "^/docs/fundamentals-and-concepts(/.*)$" "https://developers.stellar.org/docs/learn/smart-contract-internals$1" permanent;
+rewrite "^/docs/fundamentals-and-concepts(/.*)$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development$1" permanent;
 rewrite "^/docs/notes" "https://developers.stellar.org/meetings" permanent;
 ##### BEGIN merge redirects
 # developer tools and SDK
@@ -47,22 +47,22 @@ rewrite "^/reference/soroban-cli$" "https://developers.stellar.org/docs/tools/de
 rewrite "^/docs/reference/command-line$" "https://developers.stellar.org/docs/tools/developer-tools#soroban-cli" permanent;
 rewrite "^/docs/reference/soroban-cli$" "https://developers.stellar.org/docs/tools/developer-tools#soroban-cli" permanent;
 rewrite "^/docs/reference/data-providers" "https://developers.stellar.org/docs/tools/developer-tools#block-explorers" permanent;
-# soroban rpc
-rewrite "^/methods/getTransaction$" "https://developers.stellar.org/network/soroban-rpc/methods/getTransaction" permanent;
-rewrite "^/api/incomplete-methods$" "https://developers.stellar.org/network/soroban-rpc/methods" permanent;
-rewrite "^/api(.*)" "https://developers.stellar.org/network/soroban-rpc$1" permanent;
+# rpc
+rewrite "^/methods/getTransaction$" "https://developers.stellar.org/docs/data/rpc/api-reference/methods/getTransaction" permanent;
+rewrite "^/api/incomplete-methods$" "https://developers.stellar.org/docs/data/rpc/api-reference/methods" permanent;
+rewrite "^/api(.*)" "https://developers.stellar.org/docs/data/rpc$1" permanent;
 # reference
-rewrite "^/docs/reference/rpc$" "https://developers.stellar.org/network/soroban-rpc/admin-guide" permanent;
-rewrite "^/docs/reference/rpc-list$" "https://developers.stellar.org/network/soroban-rpc/rpc-providers" permanent;
+rewrite "^/docs/reference/rpc$" "https://developers.stellar.org/docs/data/rpc/admin-guide" permanent;
+rewrite "^/docs/reference/rpc-list$" "https://developers.stellar.org/docs/data/rpc/rpc-providers" permanent;
 rewrite "^/docs/reference/networks$" "https://developers.stellar.org/docs/reference/networks" permanent;
 rewrite "^/docs/reference/resource-limits-fees$" "https://developers.stellar.org/docs/reference/resource-limits-fees" permanent;
 rewrite "^/docs/reference/releases(.*)$" "https://developers.stellar.org/docs/reference/software-versions$1" permanent;
 rewrite "^/meetings(.*)$" "https://developers.stellar.org/meetings$1" permanent;
 # learn
-rewrite "^/docs/category/soroban-internals$" "https://developers.stellar.org/docs/learn/smart-contract-internals" permanent;
-rewrite "^/docs/soroban-internals/contract-interactions$" "https://developers.stellar.org/docs/learn/smart-contract-internals/contract-interactions/overview" permanent;
+rewrite "^/docs/category/soroban-internals$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development" permanent;
+rewrite "^/docs/soroban-internals/contract-interactions$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development/contract-interactions/overview" permanent;
 rewrite "^/docs/soroban-internals/fees-and-metering$" "https://developers.stellar.org/docs/learn/fundamentals/fees-resource-limits-metering" permanent;
-rewrite "^/docs/soroban-internals(.*)$" "https://developers.stellar.org/docs/learn/smart-contract-internals$1" permanent;
+rewrite "^/docs/soroban-internals(.*)$" "https://developers.stellar.org/docs/learn/encyclopedia/contract-development$1" permanent;
 rewrite "^/docs/migrate(.*)$" "https://developers.stellar.org/docs/learn/migrate$1" permanent;
 # smart contracts
 rewrite "^/docs/guides(.*)$" "https://developers.stellar.org/docs/smart-contracts/guides$1" permanent;
@@ -71,7 +71,7 @@ rewrite "^/docs/getting-started(.*)$" "https://developers.stellar.org/docs/smart
 rewrite "^/docs/category/tokens$" "https://developers.stellar.org/docs/smart-contracts/tokens" permanent;
 rewrite "^/docs/tokens(.*)$" "https://developers.stellar.org/docs/smart-contracts/tokens$1" permanent;
 rewrite "^/docs/reference/freighter$" "https://developers.stellar.org/docs/smart-contracts/guides/freighter" permanent;
-rewrite "^/docs/faq$" "https://developers.stellar.org/docs/learn/smart-contract-internals/faq" permanent;
+rewrite "^/docs/faq$" "https://developers.stellar.org" permanent;
 # dapps challenge
 rewrite "^/dapps/guides/wallets(.*)$" "https://developers.stellar.org/docs/smart-contracts/guides/freighter/integrate-freighter-react" permanent;
 rewrite "^/dapps/guides/smart-contracts(.*)" "https://developers.stellar.org/docs/learn/interactive/dapps/challenges/challenge-0-crowdfund" permanent;