diff --git a/doc/source/commands/apply.rst b/doc/source/commands/apply.rst
index 55ec372b..c358fe10 100644
--- a/doc/source/commands/apply.rst
+++ b/doc/source/commands/apply.rst
@@ -16,7 +16,7 @@ Commands
       executing apply command will execute upgrade.
 
       To see how to create an Armada manifest:
-      http://armada-helm.readthedocs.io/en/latest/operations/
+      https://airshipit.readthedocs.io/projects/armada/en/latest/operations/
 
       To install or upgrade charts, run:
 
diff --git a/doc/source/development/getting-started.rst b/doc/source/development/getting-started.rst
index 39d266e9..3a7a043d 100644
--- a/doc/source/development/getting-started.rst
+++ b/doc/source/development/getting-started.rst
@@ -13,12 +13,12 @@ Quick Start (via Container)
 
 To use the docker container to develop:
 
-#. Clone the `Armada repository <http://github.com/openstack/airship-armada>`_.
+#. Clone the `Armada repository <https://github.com/openstack/airship-armada>`_.
 #. ``cd`` into the cloned directory.
 
    .. code-block:: bash
 
-     $ git clone http://github.com/openstack/airship-armada.git && cd airship-armada
+     $ git clone https://github.com/openstack/airship-armada.git && cd airship-armada
 
 #. Next, run the following commands to install ``tox``, generate sample policy
    and configuration files, and build Armada charts as well as the Armada
@@ -115,7 +115,7 @@ Follow the steps below to install the Armada CLI.
 
 Clone the Armada repository, ``cd`` into it::
 
-  git clone http://github.com/openstack/airship-armada.git && cd airship-armada
+  git clone https://github.com/openstack/airship-armada.git && cd airship-armada
 
 It is recommended that Armada be run inside a virtual environment. To do so::
 
diff --git a/doc/source/operations/documents.rst b/doc/source/operations/documents.rst
index 7ab083d9..c5f12e19 100644
--- a/doc/source/operations/documents.rst
+++ b/doc/source/operations/documents.rst
@@ -62,10 +62,10 @@ The validation schemas below are used by Armada to validate all ingested
 Charts, Chart Groups, and Manifests. Use the schemas below as models for
 authoring Armada documents.
 
-.. _Deckhand DataSchema: https://deckhand.readthedocs.io/en/latest/document-types.html?highlight=dataschema#dataschema
+.. _Deckhand DataSchema: https://airshipit.readthedocs.io/projects/deckhand/en/latest/document-types.html?highlight=dataschema#dataschema
 .. _Helm charts: https://docs.helm.sh/developing_charts/
-.. _layering: https://deckhand.readthedocs.io/en/latest/layering.html
-.. _substitution: https://deckhand.readthedocs.io/en/latest/substitution.html
+.. _layering: https://airshipit.readthedocs.io/projects/deckhand/en/latest/layering.html
+.. _substitution: https://airshipit.readthedocs.io/projects/deckhand/en/latest/substitution.html
 
 Schemas
 ^^^^^^^
diff --git a/doc/source/operations/guide-build-armada-yaml.rst b/doc/source/operations/guide-build-armada-yaml.rst
index 5120c0b8..caabeb03 100644
--- a/doc/source/operations/guide-build-armada-yaml.rst
+++ b/doc/source/operations/guide-build-armada-yaml.rst
@@ -405,7 +405,7 @@ Simple Example
       values: {}
       source:
         type: git
-        location: http://github.com/namespace/repo
+        location: https://github.com/namespace/repo
         subpath: blog-1
         reference: new-feat
       dependencies: []
diff --git a/doc/source/operations/guide-troubleshooting.rst b/doc/source/operations/guide-troubleshooting.rst
index 6c4f4585..04ea74b8 100644
--- a/doc/source/operations/guide-troubleshooting.rst
+++ b/doc/source/operations/guide-troubleshooting.rst
@@ -28,7 +28,7 @@ When running Armada in the container you can execute docker logs to retrieve log
 Errors/Exceptions
 -----------------
 
-A guide for interpreting errors/exceptions can be found `here <http://armada-helm.readthedocs.io/en/latest/operations/guide-exceptions.html>`_.
+A guide for interpreting errors/exceptions can be found `here <https://airshipit.readthedocs.io/projects/armada/en/latest/operations/exceptions/guide-exceptions.html>`_.
 
 Working with SSL
 ----------------
diff --git a/doc/source/operations/guide-use-armada.rst b/doc/source/operations/guide-use-armada.rst
index df6fbecc..4fa562c6 100644
--- a/doc/source/operations/guide-use-armada.rst
+++ b/doc/source/operations/guide-use-armada.rst
@@ -8,10 +8,9 @@ Prerequisites
 
 Kubernetes Cluster
 
-`Tiller Service <http://github.com/kubernetes/helm>`_
+`Tiller Service <https://github.com/kubernetes/helm>`_
 
-`Armada.yaml <http://armada-helm.readthedocs.io/en/latest/operations/
-guide-build-armada-yaml.html>`_
+`Armada.yaml <https://airshipit.readthedocs.io/projects/armada/en/latest/operations/guide-build-armada-yaml.html>`_
 
 .. note::
 
@@ -32,12 +31,12 @@ Usage
 
     Pull:
 
-    docker pull quay.io/attcomdev/armada:latest
+    docker pull quay.io/airshipit/armada:latest
 
     Build:
 
     git clone https://github.com/openstack/airship-armada && cd airship-armada/
-    docker build . -t quay.io/attcomdev/armada:latest
+    docker build . -t quay.io/airshipit/armada:latest
 
 2. Running Armada
 
@@ -56,7 +55,7 @@ Usage
 
 .. code:: bash
 
-    docker run -d --net host -p 8000:8000 --name armada -v $(pwd)/etc/:/etc/ -v ~/.kube/:/armada/.kube/ -v $(pwd)/examples/:/examples quay.io/attcomdev/armada:latest
+    docker run -d --net host -p 8000:8000 --name armada -v $(pwd)/etc/:/etc/ -v ~/.kube/:/armada/.kube/ -v $(pwd)/examples/:/examples quay.io/airshipit/armada:latest
     docker exec armada armada --help