diff --git a/doc/source/admin/rescue.rst b/doc/source/admin/rescue.rst
index 0e33c6c85..cfa0beea8 100644
--- a/doc/source/admin/rescue.rst
+++ b/doc/source/admin/rescue.rst
@@ -50,4 +50,4 @@ network interfaces, and a `rescue` user will be created with the specified
 ``rescue_password``.
 
 .. _`building a CoreOS ironic-python-agent image`: https://github.com/openstack/ironic-python-agent/tree/master/imagebuild/coreos/README.rst
-.. _`build a TinyIPA image`: https://github.com/openstack/ironic-python-agent/tree/master/imagebuild/tinyipa/README.rst
+.. _`build a TinyIPA image`: https://github.com/openstack/ironic-python-agent-builder/tree/master/tinyipa/README.rst
diff --git a/doc/source/admin/troubleshooting.rst b/doc/source/admin/troubleshooting.rst
index 7f5efdcfc..46eccfdd1 100644
--- a/doc/source/admin/troubleshooting.rst
+++ b/doc/source/admin/troubleshooting.rst
@@ -136,8 +136,9 @@ Example::
 tinyipa
 ~~~~~~~
 
-The image built with scripts provided in ``imagebuild/tinyipa`` folder
-of Ironic Python Agent repository by default auto-logins the default
+The image built with scripts provided in ``tinyipa`` folder
+of `Ironic Python Agent Builder <https://opendev.org/openstack/ironic-python-agent-builder>`_
+repository by default auto-logins the default
 Tiny Core Linux user ``tc`` to the console.
 This user has no password and has password-less ``sudo`` permissions.
 
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index df94b7ade..434551499 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -45,9 +45,11 @@ installs all the required packages and configures services as needed.
 tinyipa
 -------
 
-Ironic Python Agent repo also provides a set of scripts to build a
+Now, this method is provided
+by `Ironic Python Agent Builder <https://opendev.org/openstack/ironic-python-agent-builder>`_
+repo. It provides a set of scripts to build a
 Tiny Core Linux-based deployment kernel and ramdisk (code name ``tinyipa``)
-under ``imagebuild/tinyipa`` folder.
+under ``tinyipa`` folder.
 
 `Tiny Core Linux <http://tinycorelinux.net/>`_
 is a very minimalistic Linux distribution.
@@ -59,7 +61,7 @@ On the other hand, due to its generally newer Linux kernel it also known to
 work on real hardware if the kernel supports all necessary components
 installed.
 
-Please refer to ``imagebuild/tinyipa/README.rst`` for more information and
+Please refer to ``tinyipa/README.rst`` for more information and
 build instructions.
 
 ISO Images