diff --git a/tools/airship-in-a-pod/Makefile b/tools/airship-in-a-pod/Makefile
index 6ec32ae5b..d71f0b1f1 100644
--- a/tools/airship-in-a-pod/Makefile
+++ b/tools/airship-in-a-pod/Makefile
@@ -17,15 +17,15 @@ build: libvirt
 build: $(IMAGES) ## Build the containers.
 
 base:
-	docker build --tag ianhowell/base:$(IMAGE_TAG) --build-arg BASE_IMAGE=ubuntu:20.04 ./base
+	docker build --tag $(IMAGE_REGISTRY)/aiap-base:$(IMAGE_TAG) --build-arg BASE_IMAGE=ubuntu:20.04 ./base
 ifeq (true, $(PUSH_IMAGES))
-	docker push ianhowell/base:$(IMAGE_TAG)
+	docker push $(IMAGE_REGISTRY)/aiap-base:$(IMAGE_TAG)
 endif
 
 libvirt:
-	docker build --tag ianhowell/libvirt:$(IMAGE_TAG) ./libvirt
+	docker build --tag $(IMAGE_REGISTRY)/libvirt:$(IMAGE_TAG) ./libvirt
 ifeq (true, $(PUSH_IMAGES))
-	docker push ianhowell/libvirt:$(IMAGE_TAG)
+	docker push $(IMAGE_REGISTRY)/libvirt:$(IMAGE_TAG)
 endif
 
 $(IMAGES):
diff --git a/tools/airship-in-a-pod/artifact-setup/Dockerfile b/tools/airship-in-a-pod/artifact-setup/Dockerfile
index 9345fc200..8fbd23654 100644
--- a/tools/airship-in-a-pod/artifact-setup/Dockerfile
+++ b/tools/airship-in-a-pod/artifact-setup/Dockerfile
@@ -1,4 +1,4 @@
-FROM ianhowell/base:latest
+FROM quay.io/airshipit/aiap-base:latest
 
 SHELL ["bash", "-exc"]
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/tools/airship-in-a-pod/infra-builder/Dockerfile b/tools/airship-in-a-pod/infra-builder/Dockerfile
index c10ccaaf9..83abbdc20 100644
--- a/tools/airship-in-a-pod/infra-builder/Dockerfile
+++ b/tools/airship-in-a-pod/infra-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM ianhowell/base:latest
+FROM quay.io/airshipit/aiap-base:latest
 
 SHELL ["bash", "-exc"]
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/tools/airship-in-a-pod/libvirt/Dockerfile b/tools/airship-in-a-pod/libvirt/Dockerfile
index cea9e255f..033010343 100644
--- a/tools/airship-in-a-pod/libvirt/Dockerfile
+++ b/tools/airship-in-a-pod/libvirt/Dockerfile
@@ -1,4 +1,4 @@
-FROM ianhowell/base:latest
+FROM quay.io/airshipit/aiap-base:latest
 
 SHELL ["bash", "-exc"]
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/tools/airship-in-a-pod/runner/Dockerfile b/tools/airship-in-a-pod/runner/Dockerfile
index c10a5f1a4..952f3dcf9 100644
--- a/tools/airship-in-a-pod/runner/Dockerfile
+++ b/tools/airship-in-a-pod/runner/Dockerfile
@@ -1,4 +1,4 @@
-FROM ianhowell/base:latest
+FROM quay.io/airshipit/aiap-base:latest
 
 SHELL ["bash", "-exc"]
 ENV DEBIAN_FRONTEND noninteractive