diff --git a/Makefile b/Makefile
index eab2665..ccb9311 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ $(IMAGE_NAMES:%=%-image): echo
 	docker build \
 		$(DOCKER_TAGS:%=--tag $(ORGANIZATION)/${@:%-image=%}:%) \
 		--build-arg VERSION=$(ACADEMY_VERSION) \
+		--build-arg ORGANIZATION=$(ORGANIZATION) \
 		-f $(DOCKERFILE_BASE)-${@:%-image=%} stage
 
 stage-base: stage/academy-base
diff --git a/docker/Dockerfile-academy-all b/docker/Dockerfile-academy-all
index 0a58a4f..c681c3f 100644
--- a/docker/Dockerfile-academy-all
+++ b/docker/Dockerfile-academy-all
@@ -1,6 +1,8 @@
-FROM deanwampler/academy-base:latest
+ARG VERSION
+ARG ORGANIZATION
+FROM ${ORGANIZATION}/academy-base:${VERSION}
 ARG VERSION
 LABEL maintainer="Anyscale Academy <academy@anyscale.com>"
 
-ADD academy-all/academy-$VERSION       /root/academy-$VERSION
-RUN ls -al /root/academy-$VERSION
\ No newline at end of file
+ADD academy-all/academy-${VERSION}       /root/academy-${VERSION}
+RUN ls -al /root/academy-${VERSION}
\ No newline at end of file
diff --git a/docker/Dockerfile-academy-base b/docker/Dockerfile-academy-base
index f7741e1..8d19410 100644
--- a/docker/Dockerfile-academy-base
+++ b/docker/Dockerfile-academy-base
@@ -1,5 +1,6 @@
 FROM anyscale/ray:0.8.7
 ARG VERSION
+ARG ORGANIZATION
 LABEL maintainer="Anyscale Academy <academy@anyscale.com>"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]