diff --git a/Makefile b/Makefile
index 12b3700b..85401891 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 # APP INFO
 DOCKER_REGISTRY   ?= quay.io
-IMAGE_PREFIX      ?= attcomdev
+IMAGE_PREFIX      ?= airshipit
 IMAGE_NAME        ?= armada
 IMAGE_TAG         ?= latest
 HELM              ?= helm
diff --git a/README.rst b/README.rst
index 27033fd0..6577e182 100644
--- a/README.rst
+++ b/README.rst
@@ -64,7 +64,7 @@ Afterward, you can launch the Armada container by executing:
 
     $ sudo docker run -d --net host -p 8000:8000 --name armada \
         -v ~/.kube/config:/armada/.kube/config \
-        -v $(pwd)/examples/:/examples quay.io/attcomdev/armada:latest
+        -v $(pwd)/examples/:/examples quay.io/airshipit/armada:latest
 
 Manual Installation
 ^^^^^^^^^^^^^^^^^^^
diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml
index b928d366..7b5f6beb 100644
--- a/charts/armada/values.yaml
+++ b/charts/armada/values.yaml
@@ -25,7 +25,7 @@ labels:
 
 images:
   tags:
-    api: 'quay.io/attcomdev/armada:latest'
+    api: 'quay.io/airshipit/armada:latest'
     dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
     ks_endpoints: 'docker.io/openstackhelm/heat:newton'
     ks_service: 'docker.io/openstackhelm/heat:newton'
diff --git a/controller.sh b/controller.sh
index bd3aac24..2a530365 100755
--- a/controller.sh
+++ b/controller.sh
@@ -14,7 +14,7 @@ readlink(){
 }
 
 # Check to see if the aramada container exists
-if [ -n "$( sudo docker ps -a | grep quay.io/attcomdev/armada )" ]; then
+if [ -n "$( sudo docker ps -a | grep quay.io/airshipit/armada )" ]; then
     echo "Armada container already exists..."
     clean_container armada
 fi
@@ -24,13 +24,13 @@ if [ $1 = "apply" ]; then
     # TODO Handle erroneous or missing inputs
     # Bring up a new armada container with passed in yaml mounted to the container
     echo "Creating an Armada container..."
-    docker run -d --net host -p 8000:8000 --name armada -v $(readlink $(dirname $2)):$(readlink $(dirname $2)) -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/attcomdev/armada:latest
+    docker run -d --net host -p 8000:8000 --name armada -v $(readlink $(dirname $2)):$(readlink $(dirname $2)) -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/airshipit/armada:latest
     docker exec armada armada apply $(readlink $2)
 else
     # For any other command the chart does not need to be mounted to the container
     # Bring up a new armada container
     echo "Creating an Armada container..."
-    docker run -d --net host -p 8000:8000 --name armada -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/attcomdev/armada:latest
+    docker run -d --net host -p 8000:8000 --name armada -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/airshipit/armada:latest
     docker exec armada armada "$@"
 fi
 clean_container armada