diff --git a/source/conf.py b/source/conf.py
index 64463070..605df178 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -402,7 +402,7 @@
      "reference/app-conversion": "../reference-manual/docker/compose-apps.html",
      "reference/aktualizr-lite": "../reference-manual/ota/aktualizr-lite.html",
      "reference/advanced-tagging": "../reference-manual/ota/advanced-tagging.html",
-     "reference-manual/security/secure-boot-imx6ullevk-sec.html": "secure-machines.html",
+     "reference-manual/security/secure-boot-imx6ullevk-sec.html": "security.html",
      "reference-manual/security/secure-boot-imx": "security.html",
      "reference-manual/linux/linux-targets": "linux.html",
      "reference-manual/boards/stm32mp1": "../linux/linux-supported.html#id1",
@@ -424,7 +424,7 @@
      "customer-factory/updating-the-core": "../reference-manual/linux/linux-update.html",
      "customer-factory/source-code": "../tutorials/customizing-the-platform/customizing-the-platform.html",
      "customer-factory/managing": "../getting-started/register-device/index.html",
-     "customer-factory/getting-started": "../getting-started/signup/index.html",
+     "customer-factory/getting-started": "../getting-started/index.html",
      "customer-factory/first-boot": "../getting-started/flash-device/index.html#booting-and-connecting-to-the-network",
      "customer-factory/extending": "../reference-manual/linux/linux-extending.html",
      "customer-factory/docker-apps": "../tutorials/getting-started-with-docker/getting-started-with-docker.html",
@@ -436,9 +436,10 @@
      "community-factory/docker-apps": "../tutorials/getting-started-with-docker/getting-started-with-docker.html",
      "community-factory/docker-apps-k3s": "../index.html",
      "community-factory/dependencies": "../index.html",
-     "community-factory/create-factory": "../getting-started/signup/index.html",
+     "community-factory/create-factory": "../getting-started/index.html",
      "community-factory/": "index.html",
      "getting-started/git-config/index": "../install-fioctl/index.html#configuring-git",
+     "getting-started/signup/" : "../getting-started/index.html",
      "reference-manual/linux/linux-building": "../../user-guide/lmp-customization/linux-building.html",
      "reference-manual/linux/linux-extending": "../../user-guide/lmp-customization/linux-extending.html",
      "reference-manual/qemu/qemu": "../../user-guide/qemu/qemu.html",
diff --git a/source/glossary/index.rst b/source/glossary/index.rst
index e4d057c5..dd6dc535 100644
--- a/source/glossary/index.rst
+++ b/source/glossary/index.rst
@@ -23,7 +23,7 @@ Glossary
      A Factory produces :term:`Target`\s.
      
      * :ref:`Account Management, Factory <account-management>`
-     * :ref:`Creating, Factory <gs-signup>`
+     * :ref:`Creating, Factory <gs-signup>` and `Creating, container-only Factory <gs-signup-co>`
      * :ref:`Git repositories, Factory <ref-factory-sources>`
    
    Fioctl
diff --git a/source/tutorials/customizing-the-platform/customizing-the-platform.rst b/source/tutorials/customizing-the-platform/customizing-the-platform.rst
index dd1a9765..c09eb5a5 100644
--- a/source/tutorials/customizing-the-platform/customizing-the-platform.rst
+++ b/source/tutorials/customizing-the-platform/customizing-the-platform.rst
@@ -47,7 +47,7 @@ Learning Objectives
 Prerequisites
 -------------
 
-- Completed the Getting Started from :ref:`Signed up <gs-signup>` to :ref:`gs-register`.
+- Completed the Getting Started guide up through :ref:`gs-register`.
 - Read the :ref:`ref-linux` reference manual.
 
 
diff --git a/source/tutorials/getting-started-with-docker/getting-started-with-docker.rst b/source/tutorials/getting-started-with-docker/getting-started-with-docker.rst
index c3360dc6..d0fcd7de 100644
--- a/source/tutorials/getting-started-with-docker/getting-started-with-docker.rst
+++ b/source/tutorials/getting-started-with-docker/getting-started-with-docker.rst
@@ -25,7 +25,7 @@ Learning Objectives
 Prerequisites
 -------------
 
-- :ref:`Signed up <gs-signup>` and created your Factory.
+- Created your Factory.
 - `Docker`_  installed on your host machine.
 - :ref:`Configured Git. <gs-git-config>`
 
diff --git a/source/tutorials/working-with-tags/working-with-tags.rst b/source/tutorials/working-with-tags/working-with-tags.rst
index 7cbf5f5a..66c95d9f 100644
--- a/source/tutorials/working-with-tags/working-with-tags.rst
+++ b/source/tutorials/working-with-tags/working-with-tags.rst
@@ -41,7 +41,7 @@ Learning Objectives
 Prerequisites
 -------------
 
-- Completed the Getting Started from :ref:`Signed up <gs-signup>` to :ref:`gs-register`.
+- Completed the Getting Started guide up through :ref:`gs-register`.
 - Completed the :ref:`tutorial-creating-first-target` tutorial.
 
 Instructions