diff --git a/docs/api.md b/docs/api.md
index 7f4c57d59d..a172e6fef4 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -274,14 +274,14 @@ The fields are:
   would not be managed by the Metal3DataTemplate controller, if provided by the
   user for example, the ownerreference should be set properly to ensure that the
   secret belongs to the cluster ownerReference tree (see
-  [doc](https://cluster-api.sigs.k8s.io/clusterctl/provider-contract.html#ownerreferences-chain)).
+  [doc](https://cluster-api.sigs.k8s.io/developer/providers/contracts/clusterctl.html#ownerreferences-chain)).
 
 - **networkData** is a reference to a secret containing the network data
   rendered from the Metal3DataTemplate metadata template object automatically.
   In case this would not be managed by the Metal3DataTemplate controller, if
   provided by the user for example, the ownerreference should be set properly to
   ensure that the secret belongs to the cluster ownerReference tree (see
-  [doc](https://cluster-api.sigs.k8s.io/clusterctl/provider-contract.html#ownerreferences-chain)).
+  [doc](https://cluster-api.sigs.k8s.io/developer/providers/contracts/clusterctl.html#ownerreferences-chain)).
   The content of the secret should be a yaml equivalent of a json object that
   follows the format definition that can be found
   [here](https://docs.openstack.org/nova/latest/_downloads/9119ca7ac90aa2990e762c08baea3a36/network_data.json).
diff --git a/docs/dev-setup.md b/docs/dev-setup.md
index 4632cd6055..0e46a0ded4 100644
--- a/docs/dev-setup.md
+++ b/docs/dev-setup.md
@@ -75,7 +75,7 @@ following the
 By default, the Cluster API components deployed by Tilt have experimental
 features turned off. If you would like to enable these features, add
 `extra_args` as specified in
-[The Cluster API Book](https://cluster-api.sigs.k8s.io/developer/tilt.html#create-a-tilt-settingsjson-file).
+[The Cluster API Book](https://cluster-api.sigs.k8s.io/developer/core/tilt#tilt-settings-fields).
 
 Once your kind management cluster is up and running, you can
 [deploy an example cluster](#deploy-an-example-cluster).
@@ -102,7 +102,7 @@ command
 ```
 
 To use [Tilt](https://tilt.dev/) for a simplified development workflow, follow
-the [instructions](https://cluster-api.sigs.k8s.io/developer/tilt.html) in the
+the [instructions](https://cluster-api.sigs.k8s.io/developer/core/tilt.html) in the
 cluster API repo. The instructions will walk you through cloning the Cluster API
 (CAPI) repository and configuring Tilt to use `kind` to deploy the cluster api
 management components.
diff --git a/docs/e2e-test.md b/docs/e2e-test.md
index c3930addf1..0d53f075aa 100644
--- a/docs/e2e-test.md
+++ b/docs/e2e-test.md
@@ -2,7 +2,7 @@
 
 This doc gives short instructions how to run e2e tests. For the developing e2e
 tests, please refer to
-[Developing E2E tests](https://cluster-api.sigs.k8s.io/developer/e2e.html).
+[Developing E2E tests](https://cluster-api.sigs.k8s.io/developer/core/e2e).
 
 ## Prerequisites