diff --git a/docs/canonicalk8s/about.md b/docs/canonicalk8s/about.md
new file mode 100644
index 000000000..08309665a
--- /dev/null
+++ b/docs/canonicalk8s/about.md
@@ -0,0 +1,2 @@
+```{include} src/snap/explanation/about.md
+```
\ No newline at end of file
diff --git a/docs/canonicalk8s/community.md b/docs/canonicalk8s/community.md
new file mode 100644
index 000000000..66b0a8c9d
--- /dev/null
+++ b/docs/canonicalk8s/community.md
@@ -0,0 +1,2 @@
+```{include} src/snap/reference/community.md
+```
\ No newline at end of file
diff --git a/docs/canonicalk8s/index.md b/docs/canonicalk8s/index.md
index f7f8f5a8e..f84017892 100644
--- a/docs/canonicalk8s/index.md
+++ b/docs/canonicalk8s/index.md
@@ -19,40 +19,16 @@ Home <self>
 :hidden:
 :titlesonly:
 :maxdepth: 6
-:caption: Deploy from Snap package
-Overview <src/snap/index.md>
-src/snap/tutorial/index
-src/snap/howto/index
-src/snap/explanation/index
-src/snap/reference/index
-```
 
-```{toctree}
-:hidden:
-:caption: Deploy with Juju
-:titlesonly:
-:glob:
-Overview <src/charm/index>
-src/charm/tutorial/index
-src/charm/howto/index
-src/charm/explanation/index
-src/charm/reference/index
-```
+about.md
+Deploy from Snap package <src/snap/index.md>
+Deploy with Juju <src/charm/index.md>
+Deploy with Cluster API <src/capi/index.md>
+Community <community.md>
+Release notes <release.md>
 
-```{toctree}
-:hidden:
-:caption: Deploy with Cluster API (WIP)
-:titlesonly:
-:glob:
-Overview <src/capi/index>
-src/capi/tutorial/index
-src/capi/howto/index
-src/capi/explanation/index
-src/capi/reference/index
 ```
 
----
-
 ````{grid} 1 1 2 2
 
 ```{grid-item-card}
@@ -60,7 +36,7 @@ src/capi/reference/index
 ### [Install K8s from a snap ›](src/snap/index)
 ^^^
 Our tutorials, How To guides and other pages will explain how to install,
- configure and use the {{product}} 'k8s' snap.
+ configure and use the {{product}} 'k8s' snap. This is a great option if you are new to Kubernetes.
 ```
 
 ```{grid-item-card}
@@ -79,6 +55,14 @@ Our tutorials, How To guides and other pages will explain how to install,
 Our tutorials, guides and explanation pages will explain how to install,
  configure and use {{product}} through CAPI.
 ```
+
+```{grid-item-card}
+:link: about
+### [Overview of {{product}} ›](about)
+^^^
+Find out more about {{product}}, what services are included and get the
+answers to some common questions.
+```
 ````
 
 ---
@@ -104,5 +88,5 @@ and constructive feedback.
 [community]: src/snap/reference/community
 [contribute]: src/snap/howto/contribute
 [roadmap]: src/snap/reference/roadmap
-[overview page]: src/snap/explanation/about
+[overview page]: about
 [architecture documentation]: src/snap/reference/architecture
diff --git a/docs/canonicalk8s/release.md b/docs/canonicalk8s/release.md
new file mode 100644
index 000000000..ff4bc2dc1
--- /dev/null
+++ b/docs/canonicalk8s/release.md
@@ -0,0 +1,2 @@
+```{include} src/snap/reference/releases.md
+```
\ No newline at end of file
diff --git a/docs/src/_parts/template-tutorial b/docs/src/_parts/template-tutorial
index 039f0ee52..d1d46591e 100644
--- a/docs/src/_parts/template-tutorial
+++ b/docs/src/_parts/template-tutorial
@@ -68,7 +68,7 @@ workload and remove everything again!
 
 ## Next Steps
 
-- Keep mastering Canonical Kubernetes with kubectl: [How to use kubectl]
+- How to control {{product}} with `kubectl`: [How to use kubectl]
 - Explore Kubernetes commands with our [Command Reference Guide]
 - Learn how to set up a multi-node environment [Setting up a K8s cluster]
 - Configure storage options [Storage]
diff --git a/docs/src/capi/howto/index.md b/docs/src/capi/howto/index.md
index 49fec0c83..3bf0cca3a 100644
--- a/docs/src/capi/howto/index.md
+++ b/docs/src/capi/howto/index.md
@@ -14,7 +14,7 @@ Overview <self>
 :glob:
 :titlesonly:
 
-external-etcd
+Use external etcd <external-etcd.md>
 rollout-upgrades
 in-place-upgrades
 upgrade-providers
diff --git a/docs/src/capi/index.md b/docs/src/capi/index.md
index fa1369fdb..4190229b6 100644
--- a/docs/src/capi/index.md
+++ b/docs/src/capi/index.md
@@ -1,5 +1,22 @@
 # Installing {{product}} with Cluster API
 
+```{toctree}
+:hidden:
+Overview <self>
+```
+
+```{toctree}
+:hidden:
+:titlesonly:
+:glob:
+:caption: Deploy with Cluster API
+Overview <index.md>
+tutorial/index.md
+howto/index.md
+explanation/index.md
+reference/index.md
+```
+
 Cluster API (CAPI) is a Kubernetes project focused on providing declarative APIs and tooling to simplify provisioning, upgrading, and operating multiple Kubernetes clusters. The supporting infrastructure, like virtual machines, networks, load balancers, and VPCs, as well as the cluster configuration are all defined in the same way that cluster operators are already familiar with. {{product}} supports deploying and operating Kubernetes through CAPI.
 
 ![Illustration depicting working on components and clouds][logo]
diff --git a/docs/src/capi/reference/index.md b/docs/src/capi/reference/index.md
index cd239300c..b37f2385f 100644
--- a/docs/src/capi/reference/index.md
+++ b/docs/src/capi/reference/index.md
@@ -12,7 +12,7 @@ Overview <self>
 :titlesonly:
 releases
 annotations
-community
+Community <community>
 configs
 
 ```
diff --git a/docs/src/charm/explanation/index.md b/docs/src/charm/explanation/index.md
index e73fa9827..9b4652cf2 100644
--- a/docs/src/charm/explanation/index.md
+++ b/docs/src/charm/explanation/index.md
@@ -39,4 +39,4 @@ details or information such as the command reference or release notes.
 [Tutorials section]: ../tutorial/index
 [How-to guides]:     ../howto/index
 [Reference section]: ../reference/index
-[explanation topic]: ../explanation/index.md
+[explanation topic]: ../../snap/explanation/index.md
diff --git a/docs/src/charm/howto/index.md b/docs/src/charm/howto/index.md
index d76e3913f..618ab666a 100644
--- a/docs/src/charm/howto/index.md
+++ b/docs/src/charm/howto/index.md
@@ -16,7 +16,7 @@ Overview <self>
 
 charm
 install-lxd
-etcd
+Integrate with etcd <etcd>
 proxy
 cos-lite
 contribute
diff --git a/docs/src/charm/index.md b/docs/src/charm/index.md
index 5ebb51296..bca4b8833 100644
--- a/docs/src/charm/index.md
+++ b/docs/src/charm/index.md
@@ -1,5 +1,22 @@
 # {{product}} charm documentation
 
+```{toctree}
+:hidden:
+Overview <self>
+```
+
+```{toctree}
+:hidden:
+:titlesonly:
+:caption: Deploy with Juju
+
+Overview <charm/index.md>
+tutorial/index.md
+howto/index.md
+explanation/index.md
+reference/index.md
+```
+
 The {{product}} charm, `k8s`, is an operator: software which wraps an
 application and contains all of the instructions necessary for deploying,
 configuring, scaling, integrating the application on any cloud supported by
@@ -66,10 +83,10 @@ and constructive feedback.
 <!-- LINKS -->
 
 [Code of Conduct]: https://ubuntu.com/community/ethos/code-of-conduct
-[community]: /charm/reference/community
-[contribute]: /snap/howto/contribute
-[roadmap]: /snap/reference/roadmap
-[overview page]: /charm/explanation/about
-[arch]: /charm/reference/architecture
+[community]: reference/community
+[contribute]: ../snap/howto/contribute
+[roadmap]: ../snap/reference/roadmap
+[overview page]: explanation/about
+[arch]: reference/architecture
 [Juju]: https://juju.is
-[k8s snap package]: /snap/index
\ No newline at end of file
+[k8s snap package]: ../snap/index
\ No newline at end of file
diff --git a/docs/src/charm/reference/charms.md b/docs/src/charm/reference/charms.md
index 29450218a..cac6f1949 100644
--- a/docs/src/charm/reference/charms.md
+++ b/docs/src/charm/reference/charms.md
@@ -29,7 +29,7 @@ implementation.
 
 <!-- LINKS -->
 [Juju]: https://juju.is
-[explaining channels]: /charm/explanation/channels
+[explaining channels]: ../explanation/channels
 [cs-k8s]: https://charmhub.io/k8s
 [cs-k8s-worker]: https://charmhub.io/k8s-worker
 [readme file]: https://github.com/canonical/k8s-operator#readme
diff --git a/docs/src/charm/reference/index.md b/docs/src/charm/reference/index.md
index 606de9a9a..d145e1bfd 100644
--- a/docs/src/charm/reference/index.md
+++ b/docs/src/charm/reference/index.md
@@ -15,7 +15,7 @@ releases
 charms
 proxy
 architecture
-community
+Community <community>
 
 ```
 
diff --git a/docs/src/charm/tutorial/getting-started.md b/docs/src/charm/tutorial/getting-started.md
index c43b189e5..b0859a5d1 100644
--- a/docs/src/charm/tutorial/getting-started.md
+++ b/docs/src/charm/tutorial/getting-started.md
@@ -239,5 +239,5 @@ informed of updates.
 [Juju client]: https://juju.is/docs/juju/install-and-manage-the-client
 [Juju tutorial]: https://juju.is/docs/juju/tutorial
 [Kubectl]: https://kubernetes.io/docs/reference/kubectl/
-[the channel explanation page]: /snap/explanation/channels
-[releases page]: /charm/reference/releases
\ No newline at end of file
+[the channel explanation page]: ../../snap/explanation/channels
+[releases page]: ../reference/releases
\ No newline at end of file
diff --git a/docs/src/snap/explanation/epa.md b/docs/src/snap/explanation/epa.md
index c80df8e09..616da784f 100644
--- a/docs/src/snap/explanation/epa.md
+++ b/docs/src/snap/explanation/epa.md
@@ -543,5 +543,5 @@ components and their roles:
 <!-- LINKS -->
 
 [no_hz]: https://www.kernel.org/doc/Documentation/timers/NO_HZ.txt
-[howto-epa]: /snap/howto/epa
+[howto-epa]: ../howto/epa
 
diff --git a/docs/src/snap/explanation/ingress.md b/docs/src/snap/explanation/ingress.md
index fde9bc2e9..a915d701e 100644
--- a/docs/src/snap/explanation/ingress.md
+++ b/docs/src/snap/explanation/ingress.md
@@ -78,8 +78,8 @@ outlining rules that direct traffic to your application's Kubernetes service.
 
 <!-- LINKS -->
 
-[Ingress]: /snap/howto/networking/default-ingress
-[Network]: /snap/howto/networking/default-network
+[Ingress]: ../howto/networking/default-ingress
+[Network]: ../howto/networking/default-network
 [Cilium]: https://cilium.io/
 [network plugin]: https://kubernetes.io/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/
 [Service]: https://kubernetes.io/docs/concepts/services-networking/service/
diff --git a/docs/src/snap/howto/cis-hardening.md b/docs/src/snap/howto/cis-hardening.md
index 3e1039cb6..dcc476fcd 100644
--- a/docs/src/snap/howto/cis-hardening.md
+++ b/docs/src/snap/howto/cis-hardening.md
@@ -286,7 +286,7 @@ the sets, including the dqlite specific checks in the output.
 [Center for Internet Security (CIS)]:https://www.cisecurity.org/
 [kube-bench]:https://aquasecurity.github.io/kube-bench/v0.6.15/
 [CIS Kubernetes Benchmark]:https://www.cisecurity.org/benchmark/kubernetes
-[getting-started-guide]: /snap/tutorial/getting-started
+[getting-started-guide]: ../tutorial/getting-started
 [kube-bench release]: https://github.com/aquasecurity/kube-bench/releases
 [upstream instructions]:https://kubernetes.io/docs/tasks/debug/debug-cluster/audit/
 [rate limits]:https://kubernetes.io/docs/reference/config-api/apiserver-eventratelimit.v1alpha1
diff --git a/docs/src/snap/howto/epa.md b/docs/src/snap/howto/epa.md
index 50e6b4783..b030a0585 100644
--- a/docs/src/snap/howto/epa.md
+++ b/docs/src/snap/howto/epa.md
@@ -1141,8 +1141,8 @@ the correct PCI address:
 <!-- LINKS -->
 
 [MAAS]: https://maas.io
-[channel]: https://documentation.ubuntu.com/canonical-kubernetes/latest/snap/explanation/channels/
-[install-link]: /snap/howto/install/snap
+[channel]: ../explanation/channels/
+[install-link]: install/snap
 [snap]: https://snapcraft.io/docs
 [cyclictest]: https://github.com/jlelli/rt-tests
-[explain-epa]: /snap/explanation/epa
\ No newline at end of file
+[explain-epa]: ../explanation/epa
\ No newline at end of file
diff --git a/docs/src/snap/howto/index.md b/docs/src/snap/howto/index.md
index 0ad1890b6..0df54a503 100644
--- a/docs/src/snap/howto/index.md
+++ b/docs/src/snap/howto/index.md
@@ -17,16 +17,15 @@ Overview <self>
 install/index
 networking/index
 storage/index
-external-datastore
-proxy
+Use an external datastore <external-datastore>
 backup-restore
 refresh-certs
 restore-quorum
 two-node-ha
-epa
+Set up Enhanced Platform Awareness <epa>
 cis-hardening
 contribute
-support
+Get support <support>
 ```
 
 ---
diff --git a/docs/src/snap/howto/install/index.md b/docs/src/snap/howto/install/index.md
index 6c7403acc..76e1169c7 100644
--- a/docs/src/snap/howto/install/index.md
+++ b/docs/src/snap/howto/install/index.md
@@ -12,8 +12,8 @@ the current How-to guides below.
 :glob:
 :titlesonly:
 
-snap
+Install from a snap <snap.md>
 multipass
-lxd
-offline
+Install in LXD <lxd.md>
+Install in air-gapped environments <offline.md>
 ```
diff --git a/docs/src/snap/howto/install/lxd.md b/docs/src/snap/howto/install/lxd.md
index e81a1c11b..f72afaa4f 100644
--- a/docs/src/snap/howto/install/lxd.md
+++ b/docs/src/snap/howto/install/lxd.md
@@ -239,4 +239,4 @@ need to access for example storage devices (See comment in [^5]).
 [default-bridged-networking]: https://ubuntu.com/blog/lxd-networking-lxdbr0-explained
 [Microbot]: https://github.com/dontrebootme/docker-microbot
 [AppArmor]: https://apparmor.net/
-[channels]: /snap/explanation/channels
+[channels]: ../../explanation/channels
diff --git a/docs/src/snap/howto/install/offline.md b/docs/src/snap/howto/install/offline.md
index 545e37ab4..d44fb1642 100644
--- a/docs/src/snap/howto/install/offline.md
+++ b/docs/src/snap/howto/install/offline.md
@@ -29,7 +29,7 @@ are necessary to verify the integrity of the packages.
 ```{note}
 Update the version of k8s by adjusting the channel parameter.
 For more information on channels visit the
-[channels explanation](/snap/explanation/channels.md).
+[channels explanation](../../explanation/channels.md).
 ```
 
 ```{note}
@@ -299,11 +299,10 @@ After a while, confirm that all the cluster nodes show up in the output of the
 <!-- LINKS -->
 
 [Core20]: https://canonical.com/blog/ubuntu-core-20-secures-linux-for-iot
-[svc-ports]: /snap/explanation/services-and-ports.md
-[proxy]: /snap/howto/proxy.md
+[proxy]: ../networking/proxy.md
 [sync-images-yaml]: https://github.com/canonical/k8s-snap/blob/main/build-scripts/hack/sync-images.yaml
 [regsync]: https://github.com/regclient/regclient/blob/main/docs/regsync.md
 [regctl]: https://github.com/regclient/regclient/blob/main/docs/regctl.md
 [regctl.sh]: https://github.com/canonical/k8s-snap/blob/main/src/k8s/tools/regctl.sh
-[nodes]: /snap/tutorial/add-remove-nodes.md
+[nodes]: ../../tutorial/add-remove-nodes.md
 [squid]: https://www.squid-cache.org/
diff --git a/docs/src/snap/howto/install/snap.md b/docs/src/snap/howto/install/snap.md
index cc16e7cd6..b18afdf1c 100644
--- a/docs/src/snap/howto/install/snap.md
+++ b/docs/src/snap/howto/install/snap.md
@@ -80,4 +80,4 @@ ready state.
 [channels page]: ../../explanation/channels
 [snap]: https://snapcraft.io/docs
 [snapd support]: https://snapcraft.io/docs/installing-snapd
-[bootstrap]: /snap/reference/bootstrap-config-reference
\ No newline at end of file
+[bootstrap]: ../../reference/bootstrap-config-reference
\ No newline at end of file
diff --git a/docs/src/snap/howto/networking/default-dns.md b/docs/src/snap/howto/networking/default-dns.md
index 34722d3a1..6cc6e4aac 100644
--- a/docs/src/snap/howto/networking/default-dns.md
+++ b/docs/src/snap/howto/networking/default-dns.md
@@ -94,4 +94,4 @@ sudo k8s help disable
 
 <!-- LINKS -->
 
-[getting-started-guide]: /snap/tutorial/getting-started
+[getting-started-guide]: ../../tutorial/getting-started
diff --git a/docs/src/snap/howto/networking/default-ingress.md b/docs/src/snap/howto/networking/default-ingress.md
index 90498d910..2340c806d 100644
--- a/docs/src/snap/howto/networking/default-ingress.md
+++ b/docs/src/snap/howto/networking/default-ingress.md
@@ -107,5 +107,5 @@ sudo k8s help disable
 
 [kubectl-create-secret-tls/]: https://kubernetes.io/docs/reference/kubectl/generated/kubectl_create/kubectl_create_secret_tls/
 [proxy-protocol]: https://kubernetes.io/docs/reference/networking/service-protocols/#protocol-proxy-special
-[getting-started-guide]: /snap/tutorial/getting-started
-[kubectl-guide]: /snap/tutorial/kubectl
+[getting-started-guide]: ../../tutorial/getting-started
+[kubectl-guide]: ../../tutorial/kubectl
diff --git a/docs/src/snap/howto/networking/default-loadbalancer.md b/docs/src/snap/howto/networking/default-loadbalancer.md
index 0fd14ced9..4ca55115a 100644
--- a/docs/src/snap/howto/networking/default-loadbalancer.md
+++ b/docs/src/snap/howto/networking/default-loadbalancer.md
@@ -82,4 +82,4 @@ sudo k8s disable load-balancer
 <!-- LINKS -->
 
 [cidr]: https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
-[getting-started-guide]: /snap/tutorial/getting-started
+[getting-started-guide]: ../../tutorial/getting-started
diff --git a/docs/src/snap/howto/networking/default-network.md b/docs/src/snap/howto/networking/default-network.md
index bde0aad9e..d39537bc2 100644
--- a/docs/src/snap/howto/networking/default-network.md
+++ b/docs/src/snap/howto/networking/default-network.md
@@ -91,4 +91,4 @@ sudo k8s disable network --help
 
 <!-- LINKS -->
 
-[getting-started-guide]: /snap/tutorial/getting-started
+[getting-started-guide]: ../../tutorial/getting-started
diff --git a/docs/src/snap/howto/networking/index.md b/docs/src/snap/howto/networking/index.md
index 4973f6f82..d015577a2 100644
--- a/docs/src/snap/howto/networking/index.md
+++ b/docs/src/snap/howto/networking/index.md
@@ -11,10 +11,11 @@ how to configure and use key capabilities of {{product}}.
 ```{toctree}
 :titlesonly:
 
-default-dns.md
-default-network.md
-default-ingress.md
-default-loadbalancer.md
-dualstack.md
-ipv6.md
+Use default DNS <default-dns.md>
+Use default network <default-network.md>
+Use default Ingress <default-ingress.md>
+Use default load-balancer <default-loadbalancer.md>
+Enable Dual-Stack networking <dualstack.md>
+Set up an IPv6-only cluster <ipv6.md>
+Configure proxy settings <proxy.md>
 ```
diff --git a/docs/src/snap/howto/networking/ipv6.md b/docs/src/snap/howto/networking/ipv6.md
index 143379ab7..da88ef9a5 100644
--- a/docs/src/snap/howto/networking/ipv6.md
+++ b/docs/src/snap/howto/networking/ipv6.md
@@ -1,4 +1,4 @@
-# How to Setup an IPv6-Only Cluster
+# How to set up an IPv6-Only Cluster
 
 An IPv6-only Kubernetes cluster operates exclusively using IPv6 addresses,
 without support for IPv4. This configuration is ideal for environments that
diff --git a/docs/src/snap/howto/proxy.md b/docs/src/snap/howto/networking/proxy.md
similarity index 98%
rename from docs/src/snap/howto/proxy.md
rename to docs/src/snap/howto/networking/proxy.md
index 29a138b72..c6f78b674 100644
--- a/docs/src/snap/howto/proxy.md
+++ b/docs/src/snap/howto/networking/proxy.md
@@ -53,5 +53,5 @@ see the [documentation for adding proxy configuration via Juju][juju-proxy].
 
 <!-- LINKS -->
 
-[juju-proxy]: /charm/howto/proxy
+[juju-proxy]: ../../../charm/howto/proxy
 [squid]: https://ubuntu.com/server/docs/how-to-install-a-squid-server
diff --git a/docs/src/snap/howto/storage/ceph.md b/docs/src/snap/howto/storage/ceph.md
index ff55d10dd..e318ea8f1 100644
--- a/docs/src/snap/howto/storage/ceph.md
+++ b/docs/src/snap/howto/storage/ceph.md
@@ -331,7 +331,7 @@ Ceph documentation: [Intro to Ceph].
 <!-- LINKS -->
 
 [Ceph]: https://ceph.com/
-[getting-started-guide]: /snap/tutorial/getting-started.md
+[getting-started-guide]: ../../tutorial/getting-started.md
 [block-devices-and-kubernetes]: https://docs.ceph.com/en/latest/rbd/rbd-kubernetes/
 [placement groups]: https://docs.ceph.com/en/mimic/rados/operations/placement-groups/
 [Intro to Ceph]: https://docs.ceph.com/en/latest/start/intro/
diff --git a/docs/src/snap/howto/storage/index.md b/docs/src/snap/howto/storage/index.md
index 4310beac7..43728a9ba 100644
--- a/docs/src/snap/howto/storage/index.md
+++ b/docs/src/snap/howto/storage/index.md
@@ -12,6 +12,6 @@ default storage built-in to {{product}}.
 ```{toctree}
 :titlesonly:
 
-storage
-ceph
+Use default storage <storage.md>
+Use Ceph storage <ceph.md>
 ```
\ No newline at end of file
diff --git a/docs/src/snap/howto/storage/storage.md b/docs/src/snap/howto/storage/storage.md
index 71e9c3dd1..3b7d0a261 100644
--- a/docs/src/snap/howto/storage/storage.md
+++ b/docs/src/snap/howto/storage/storage.md
@@ -62,4 +62,4 @@ Disabling storage only removes the CSI driver. The persistent volume claims
 will still be available and your data will remain on disk.
 
 <!-- LINKS -->
-[getting-started-guide]: /snap/tutorial/getting-started.md
+[getting-started-guide]: ../../tutorial/getting-started.md
diff --git a/docs/src/snap/index.md b/docs/src/snap/index.md
index 7022a799f..10ec043e9 100644
--- a/docs/src/snap/index.md
+++ b/docs/src/snap/index.md
@@ -1,5 +1,21 @@
 # {{product}} snap documentation
 
+```{toctree}
+:hidden:
+Overview <self>
+```
+
+```{toctree}
+:hidden:
+:titlesonly:
+:maxdepth: 6
+Overview <index.md>
+tutorial/index.md
+howto/index.md
+explanation/index.md
+reference/index.md
+```
+
 The {{product}} snap is a performant, lightweight, secure and
 opinionated distribution of **Kubernetes** which includes everything needed to
 create and manage a scalable cluster suitable for all use cases.
@@ -70,4 +86,4 @@ and constructive feedback.
 [roadmap]: ./reference/roadmap
 [overview page]: ./explanation/about
 [architecture documentation]: ./reference/architecture
-[Juju charm]: /charm/index
+[Juju charm]: ../charm/index
diff --git a/docs/src/snap/reference/annotations.md b/docs/src/snap/reference/annotations.md
index a825c0f4d..5a8ebf2b1 100644
--- a/docs/src/snap/reference/annotations.md
+++ b/docs/src/snap/reference/annotations.md
@@ -33,4 +33,4 @@ the bootstrap configuration.
 
 <!-- Links -->
 
-[bootstrap]: /snap/reference/bootstrap-config-reference
+[bootstrap]: bootstrap-config-reference
diff --git a/docs/src/snap/reference/index.md b/docs/src/snap/reference/index.md
index 840b4ab56..bd7a9217f 100644
--- a/docs/src/snap/reference/index.md
+++ b/docs/src/snap/reference/index.md
@@ -21,7 +21,7 @@ worker-join-config-reference
 proxy
 troubleshooting
 architecture
-community
+Community <community>
 roadmap
 ```
 
diff --git a/docs/src/snap/reference/proxy.md b/docs/src/snap/reference/proxy.md
index cc8d17465..31acde759 100644
--- a/docs/src/snap/reference/proxy.md
+++ b/docs/src/snap/reference/proxy.md
@@ -37,5 +37,6 @@ how to set these.
 
 <!-- LINKS -->
 
-[How to guide for configuring proxies for the k8s snap]: ../howto/proxy
+[How to guide for configuring proxies for the k8s snap]: ../howto/networking/proxy
 [How to guide for configuring proxies for k8s charms]: ../../charm/howto/proxy
+
diff --git a/docs/src/snap/tutorial/add-remove-nodes.md b/docs/src/snap/tutorial/add-remove-nodes.md
index b36fd9a55..24b2bb88a 100644
--- a/docs/src/snap/tutorial/add-remove-nodes.md
+++ b/docs/src/snap/tutorial/add-remove-nodes.md
@@ -142,7 +142,7 @@ multipass purge
 ## Next Steps
 
 - Discover how to enable and configure Ingress resources [Ingress][Ingress]
-- Keep mastering {{product}} with kubectl [How to use
+- Learn more about {{product}} with kubectl [How to use
   kubectl][Kubectl]
 - Explore Kubernetes commands with our [Command Reference
   Guide][Command Reference]
@@ -153,8 +153,8 @@ multipass purge
 
 [Getting started]: getting-started
 [Multipass Installation]: https://multipass.run/install
-[Ingress]: /snap/howto/networking/default-ingress
+[Ingress]: ../howto/networking/default-ingress
 [Kubectl]: kubectl
-[Command Reference]: /snap/reference/commands
-[Storage]: /snap/howto/storage/index
-[Networking]: /snap/howto/networking/index.md
+[Command Reference]: ../reference/commands
+[Storage]: ../howto/storage/index
+[Networking]: ../howto/networking/index.md
diff --git a/docs/src/snap/tutorial/getting-started.md b/docs/src/snap/tutorial/getting-started.md
index a79c8031d..69832a87d 100644
--- a/docs/src/snap/tutorial/getting-started.md
+++ b/docs/src/snap/tutorial/getting-started.md
@@ -203,18 +203,18 @@ This option ensures complete removal of the snap and its associated data.
 
 ## Next Steps
 
-- Keep mastering {{product}} with kubectl: [How to use kubectl]
+- Learn more about {{product}} with kubectl: [How to use kubectl]
 - Explore Kubernetes commands with our [Command Reference Guide]
 - Learn how to set up a multi-node environment [Setting up a K8s cluster]
-- Configure storage options [Storage]
+- Configure storage options: [Storage]
 - Master Kubernetes networking concepts: [Networking]
 - Discover how to enable and configure Ingress resources [Ingress]
 
 <!-- LINKS -->
 
 [How to use kubectl]: kubectl
-[Command Reference Guide]: /snap/reference/commands
+[Command Reference Guide]: ../reference/commands
 [Setting up a K8s cluster]: add-remove-nodes
-[Storage]: /snap/howto/storage/index
-[Networking]: /snap/howto/networking/index.md
-[Ingress]: /snap/howto/networking/default-ingress.md
\ No newline at end of file
+[Storage]: ../howto/storage/index
+[Networking]: ../howto/networking/index.md
+[Ingress]: ../howto/networking/default-ingress.md
\ No newline at end of file
diff --git a/docs/src/snap/tutorial/index.md b/docs/src/snap/tutorial/index.md
index 237c89aed..b124db24b 100644
--- a/docs/src/snap/tutorial/index.md
+++ b/docs/src/snap/tutorial/index.md
@@ -33,6 +33,6 @@ Finally, our [Reference section] is for when you need to check specific details
 or information such as the command reference or release notes.
 
 <!--LINKS -->
-[How-to guides]: /snap/howto/index
-[Explanation section]: /snap/explanation/index
-[Reference section]: /snap/reference/index
+[How-to guides]: ../howto/index
+[Explanation section]: ../explanation/index
+[Reference section]: ../reference/index
diff --git a/docs/src/snap/tutorial/kubectl.md b/docs/src/snap/tutorial/kubectl.md
index 2f9fed807..02b643c18 100644
--- a/docs/src/snap/tutorial/kubectl.md
+++ b/docs/src/snap/tutorial/kubectl.md
@@ -123,7 +123,7 @@ pods will have a status of `ContainerCreating`.
 
 <!-- LINKS -->
 
-[Command Reference Guide]: /snap/reference/commands
+[Command Reference Guide]: ../reference/commands
 [Getting Started]: getting-started
 [kubernetes-api-server]: https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/
 [kubeconfig-doc]: https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/