diff --git a/tutorial_buildsystems.rst b/tutorial_buildsystems.rst
index 66b51707cb..aa6268d458 100644
--- a/tutorial_buildsystems.rst
+++ b/tutorial_buildsystems.rst
@@ -685,4 +685,4 @@ Each of these classes have their own abstractions to help assist in writing pack
 For whatever doesn't fit nicely into the other build systems, you can use the ``Package`` class.
 
 Hopefully by now you can see how we aim to make packaging simple and robust through these classes.
-If you want to learn more about these build systems, check out `Implementing the installation procedure <https://spack.readthedocs.io/en/latest/packaging_guide.html#installation-procedure>`_ in the Packaging Guide.
+If you want to learn more about these build systems, check out `Overview of the installation procedure <https://spack.readthedocs.io/en/latest/packaging_guide_build.html#installation-procedure>`_ in the Packaging Guide.
diff --git a/tutorial_developer_workflows.rst b/tutorial_developer_workflows.rst
index 05094b4fb1..3954a61183 100644
--- a/tutorial_developer_workflows.rst
+++ b/tutorial_developer_workflows.rst
@@ -156,7 +156,7 @@ There are a few gotchas with the ``spack develop`` command
   package as a dev package. Spack needs to know the version of the dev
   package so it can supply the correct flags for the package's build
   system. If a version is not supplied, then Spack will take the maximum version
-  defined in the package where `infinity versions <https://spack.readthedocs.io/en/latest/packaging_guide.html#version-comparison>`_ like ``develop`` and ``main``
+  defined in the package where `infinity versions <https://spack.readthedocs.io/en/latest/packaging_guide_creation.html#version-comparison>`_ like ``develop`` and ``main``
   have a higher value than the numeric versions.
 * You should ensure a spec for the package you are developing appears in the DAG of at least one of the roots of the environment with the same version that you are developing.
   ``spack add <package>`` with the matching version you want to develop is a way to ensure
diff --git a/tutorial_environments.rst b/tutorial_environments.rst
index f8c0a633e4..728a6caa16 100644
--- a/tutorial_environments.rst
+++ b/tutorial_environments.rst
@@ -197,7 +197,7 @@ So, adding specs to an environment at a later point in time will not cause exist
      share dependencies and reduces total installation time.
 
    * You can launch all builds in parallel by taking advantage of Spack's
-     `install-level build parallelism <https://spack.readthedocs.io/en/latest/packaging_guide.html#install-level-build-parallelism>`_.
+     `install-level build parallelism <https://spack.readthedocs.io/en/latest/config_yaml.html#build-jobs>`_.
 
 ^^^^^^^^^^^^^^
 Using Packages
@@ -750,7 +750,7 @@ Setting up and building environments
   for configuring combinatorial environments (e.g., same packages across a
   list of compilers)
 * `Install-level parallel builds
-  <https://spack.readthedocs.io/en/latest/packaging_guide.html#install-level-build-parallelism>`_:
+  <https://spack.readthedocs.io/en/latest/config_yaml.html#build-jobs>`_:
   for how to launch ``spack install`` to build your environment in parallel
 
 ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tutorial_packaging.rst b/tutorial_packaging.rst
index aad1dc0d96..d8b0f3673d 100644
--- a/tutorial_packaging.rst
+++ b/tutorial_packaging.rst
@@ -193,7 +193,7 @@ As we fill in more information about the package, the ``spack info`` command wil
    <https://spack.readthedocs.io/en/latest/build_systems.html>`_.
 
    More information on the build-time tests can be found at
-   `<https://spack.readthedocs.io/en/latest/packaging_guide.html#build-time-tests>`_.
+   `<https://spack.readthedocs.io/en/latest/packaging_guide_testing.html#build-time-tests>`_.
 
    Refer to the links at the end of this section for more information.
 
@@ -655,7 +655,7 @@ Testing an installation
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 * `Checking an installation
-  <https://spack.readthedocs.io/en/latest/packaging_guide.html#checking-an-installation>`_:
+  <https://spack.readthedocs.io/en/latest/packaging_guide_testing.html#checking-an-installation>`_:
   for more information on adding tests that run at build-time and against an installation.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -669,10 +669,10 @@ Using other build systems
   <https://spack-tutorial.readthedocs.io/en/latest/tutorial_buildsystems.html>`_:
   for tutorials on common build systems.
 * `Multiple Build Systems
-  <https://spack.readthedocs.io/en/latest/packaging_guide.html#multiple-build-systems>`_:
+  <https://spack.readthedocs.io/en/latest/packaging_guide_advanced.html#multiple-build-systems>`_:
   for a reference on writing packages with multiple build systems.
 * `Package Class Architecture
-  <https://spack.readthedocs.io/en/latest/packaging_guide.html#package-class-architecture>`_:
+  <https://spack.readthedocs.io/en/latest/developer_guide.html#package-class-architecture>`_:
   for more insight on the inner workings of ``Package`` and ``Builder`` classes.
 * `The GDAL Package
   <https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/gdal/package.py>`_:
@@ -683,5 +683,5 @@ Making a package externally detectable
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * `Making a package externally discoverable
-  <https://spack.readthedocs.io/en/latest/packaging_guide.html#making-a-package-discoverable-with-spack-external-find>`_:
+  <https://spack.readthedocs.io/en/latest/packaging_guide_advanced.html#making-a-package-discoverable-with-spack-external-find>`_:
   for making a package discoverable using the ``spack external find`` command.