diff --git a/Makefile b/Makefile
index 79388b9..9de876a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 SPYGLASS_BUILD_CTX  ?= .
 IMAGE_NAME        ?= spyglass
-IMAGE_PREFIX      ?= att-comdev
+IMAGE_PREFIX      ?= airshipit
 DOCKER_REGISTRY   ?= quay.io
 IMAGE_TAG         ?= latest
 PROXY             ?= http://proxy.foo.com:8000
diff --git a/doc/source/getting_started.rst b/doc/source/getting_started.rst
index d8d52ba..bca3532 100644
--- a/doc/source/getting_started.rst
+++ b/doc/source/getting_started.rst
@@ -132,13 +132,13 @@ Before using Spyglass you must:
 
    .. code-block:: console
 
-    git clone https://github.com/att-comdev/spyglass
+    git clone https://github.com/openstack/airship-spyglass
 
 2. Install the required packages in spyglass:
 
    .. code-block:: console
 
-     pip3 install -r tugboat/requirements.txt
+     pip3 install -r airship-spyglass/requirements.txt
 
 
 CLI Options
diff --git a/setup.py b/setup.py
index 6cbf558..4b43c75 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ setup(
     name='spyglass',
     version='0.0.1',
     description='Generate Airship specific yaml manifests from data sources',
-    url='http://github.com/att-comdev/spyglass',
+    url='http://github.com/openstack/airship-spyglass',
     python_requires='>=3.5.0',
     license='Apache 2.0',
     packages=find_packages(),
diff --git a/spyglass/examples/templates/secrets/certificates/certificates.yaml.j2 b/spyglass/examples/templates/secrets/certificates/certificates.yaml.j2
index 5cb4018..6e3b993 100644
--- a/spyglass/examples/templates/secrets/certificates/certificates.yaml.j2
+++ b/spyglass/examples/templates/secrets/certificates/certificates.yaml.j2
@@ -1,7 +1,6 @@
 ---
 # Certs generated by Promenade, see docs at
-# TODO: move to https://github.com/openstack/airship-treasuremap/blob/master/docs/source/authoring_and_deployment.rst
-# https://github.com/att-comdev/treasuremap/blob/master/docs/source/deployment.rst#sitenew_sitepkipki-catalogyaml
+# https://github.com/openstack/airship-treasuremap/blob/master/doc/source/authoring_and_deployment.rst
 data: |
   -----BEGIN CERTIFICATE-----
   MIIDSDCCAjCgAwIBAgIUegkh/antB1XyDVHdP5dv+0MZyBcwDQYJKoZIhvcNAQEL
diff --git a/tools/spyglass.sh b/tools/spyglass.sh
index 4d93440..dd2f555 100755
--- a/tools/spyglass.sh
+++ b/tools/spyglass.sh
@@ -3,7 +3,7 @@
 set -e
 
 : ${WORKSPACE:=$(pwd)}
-: ${IMAGE:=quay.io/att-comdev/spyglass:latest}
+: ${IMAGE:=quay.io/airshipit/spyglass:latest}
 
 echo
 echo "== NOTE: Workspace $WORKSPACE is the execution directory in the container =="