diff --git a/README.rst b/README.rst
index 8e2ca23e..27033fd0 100644
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,7 @@ Armada is a tool for managing multiple Helm charts with dependencies by
centralizing all configurations in a single Armada YAML and providing
life-cycle hooks for all Helm releases.
-Find more documentation for Armada on `Read The Docs `_.
+Find more documentation for Armada on `Read The Docs `_.
Overview
--------
@@ -108,14 +108,14 @@ Further Reading
`Airship `_.
-.. _Manual Install Guide: http://armada-helm.readthedocs.io/en/latest/development/getting-started.html#developer-install-guide
-.. _Armada Quickstart: http://armada-helm.readthedocs.io/en/latest/operations/guide-use-armada.html
+.. _Manual Install Guide: https://airship-armada.readthedocs.io/en/latest/development/getting-started.html#developer-install-guide
+.. _Armada Quickstart: https://airship-armada.readthedocs.io/en/latest/operations/guide-use-armada.html
.. _kubectl: https://kubernetes.io/docs/user-guide/kubectl/kubectl_config/
.. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation
-.. _Deckhand: https://github.com/openstack/deckhand
+.. _Deckhand: https://github.com/openstack/airship-deckhand
.. _Keystone: https://github.com/openstack/keystone
-.. |Docker Repository on Quay| image:: https://quay.io/repository/attcomdev/armada/status
- :target: https://quay.io/repository/attcomdev/armada
-.. |Doc Status| image:: https://readthedocs.org/projects/armada-helm/badge/?version=latest
- :target: http://armada-helm.readthedocs.io/
+.. |Docker Repository on Quay| image:: https://quay.io/repository/airshipit/armada/status
+ :target: https://quay.io/repository/airshipit/armada
+.. |Doc Status| image:: https://readthedocs.org/projects/airship-armada/badge/?version=latest
+ :target: https://airship-armada.readthedocs.io/
diff --git a/armada/cli/apply.py b/armada/cli/apply.py
index 414d3eb5..9a53f9c1 100644
--- a/armada/cli/apply.py
+++ b/armada/cli/apply.py
@@ -40,7 +40,7 @@ command once will install all charts defined in manifest. Re-executing apply
command will execute upgrade.
To see how to create an Armada manifest:
- http://armada-helm.readthedocs.io/en/latest/operations/
+ https://airship-armada.readthedocs.io/en/latest/operations/
To install or upgrade charts, run:
diff --git a/charts/armada/Chart.yaml b/charts/armada/Chart.yaml
index f87d3b3d..acba5368 100644
--- a/charts/armada/Chart.yaml
+++ b/charts/armada/Chart.yaml
@@ -18,7 +18,7 @@ name: armada
version: 0.1.0
keywords:
- armada
-home: http://armada-helm.readthedocs.io/en/latest/
+home: https://airship-armada.readthedocs.io/en/latest/
sources:
- https://github.com/openstack/airship-armada
engine: gotpl
diff --git a/setup.cfg b/setup.cfg
index 869a80ff..b83dff0a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ summary = tool for managing multiple chart orchestration lifecycle
description-file = README.rst
author = armada team
-home-page = http://armada-helm.readthedocs.io/en/latest/
+home-page = https://airship-armada.readthedocs.io/en/latest/
classifier =
Intended Audience :: Information Technology
Intended Audience :: System Administrators