diff --git a/deploy-guide/source/multinode.rst b/deploy-guide/source/multinode.rst
index f5a22f6c91..e1d9f87b96 100644
--- a/deploy-guide/source/multinode.rst
+++ b/deploy-guide/source/multinode.rst
@@ -1,2 +1,2 @@
 .. multinode:
-.. include:: ../../doc/multinode.rst
+.. include:: ../../doc/source/user/multinode.rst
diff --git a/deploy-guide/source/quickstart.rst b/deploy-guide/source/quickstart.rst
index 63f89ea559..5791e4d017 100644
--- a/deploy-guide/source/quickstart.rst
+++ b/deploy-guide/source/quickstart.rst
@@ -1,2 +1,3 @@
 .. quickstart:
-.. include:: ../../doc/quickstart.rst
+
+.. include:: ../../doc/source/user/quickstart.rst
diff --git a/doc/source/contributor/CONTRIBUTING.rst b/doc/source/contributor/CONTRIBUTING.rst
index 07b24c5287..27c0e36af7 100644
--- a/doc/source/contributor/CONTRIBUTING.rst
+++ b/doc/source/contributor/CONTRIBUTING.rst
@@ -30,8 +30,8 @@ Basics
 Development Environment
 =======================
 
-Please follow our :doc:`/user/quickstart` to deploy your environment and test your
-changes.
+Please follow our :doc:`/user/quickstart` to deploy your environment and test
+your changes.
 
 Please use the existing sandbox repository, available at
 https://git.openstack.org/cgit/openstack-dev/sandbox, for learning, understanding
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index bdb996ec4a..c85b8f29d4 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -29,7 +29,7 @@ bare metal or a virtual machine with Kolla.
 
 If developing Kolla on a system that provides VirtualBox or Libvirt in addition
 to Vagrant, use the Vagrant virtual environment documented in
-:doc:`/contributor/vagrant-dev-env`.
+`Development Environment with Vagrant <https://docs.openstack.org/kolla-ansible/latest/contributor/vagrant-dev-env.html>`_.
 
 Prerequisites
 =============