diff --git a/debootstrap.mk b/debootstrap.mk
index b5b88a6..f3b33f9 100644
--- a/debootstrap.mk
+++ b/debootstrap.mk
@@ -24,21 +24,21 @@
 		$(DEBOOTSTRAP_ARGS) \
 		--make-tarball=$(DEBOOTSTRAP_TARBALL) \
 		stretch $(PRODUCT_OUT)/obj/DEBOOTSTRAP
-	+make -f $(ROOTDIR)/build/debootstrap.mk make-bootstrap-sha256sum
+	+make -f $(ROOTDIR)/build/debootstrap.mk bootstrap-sha256sum
 endif
 
-make-bootstrap-tarball: $(DEBOOTSTRAP_TARBALL)
+bootstrap-tarball: $(DEBOOTSTRAP_TARBALL)
 
-make-bootstrap-sha256sum: $(DEBOOTSTRAP_TARBALL)
+bootstrap-sha256sum: $(DEBOOTSTRAP_TARBALL)
 	cd $(ROOTDIR)/cache && \
 		sha256sum $(notdir $(DEBOOTSTRAP_TARBALL)) > $(DEBOOTSTRAP_TARBALL_SHA256)
 
 targets::
 	@echo "validate-bootstrap-tarball - validates the bootstrap tarball matches the SHA-256 sums"
-	@echo "make-bootstrap-tarball - makes the debootstrap tarball for faster rootfs building"
-	@echo "make-bootstrap-sha256sum - calculates the SHA-256 sums of the debootstrap tarball"
+	@echo "bootstrap-tarball - makes the debootstrap tarball for faster rootfs building"
+	@echo "bootstrap-sha256sum - calculates the SHA-256 sums of the debootstrap tarball"
 
 clean::
 	sudo rm -rf $(PRODUCT_OUT)/obj/DEBOOTSTRAP
 
-.PHONY:: validate-bootstrap-tarball make-bootstrap-sha256sum make-bootstrap-tarball
+.PHONY:: validate-bootstrap-tarball bootstrap-sha256sum bootstrap-tarball
diff --git a/docker.mk b/docker.mk
index 433fc25..be694f2 100644
--- a/docker.mk
+++ b/docker.mk
@@ -36,8 +36,8 @@
 	docker rmi arm64-builder:latest
 endif
 
-# Macros for running make target in x86 docker image
-define docker_body
+# Runs any make TARGET in x86 docker image ('m docker-TARGET')
+docker-%: docker-build;
 	docker load -i $(ROOTDIR)/cache/aiy-board-builder.tar
 	docker run --rm --privileged --tty \
 		-v /dev\:/dev \
@@ -68,28 +68,7 @@
 			adduser $(shell id -u -n) docker; \
 			/etc/init.d/docker start; \
 			sudo -E -u $(shell id -u -n) /bin/bash -c "source build/setup.sh; m \
-			-j$(shell nproc)
-endef
-
-define docker_tail
-	";'
-endef
-
-define docker-run
-docker-$1: docker-build;
-	$(call docker_body) $2 $(call docker_tail)
-endef
-
-$(call docker-run,bootstrap,make-bootstrap-tarball)
-$(call docker-run,rootfs,rootfs_raw)
-$(call docker-run,rootfs-final,rootfs)
-$(call docker-run,boot,boot)
-$(call docker-run,all,boot-targets)
-$(call docker-run,sdcard,sdcard)
-$(call docker-run,make-repo,make-repo)
-
-docker-%: docker-build;
-	$(call docker_body) $* $(call docker_tail)
+			-j$(shell nproc) $*";'
 
 # Macro for running make target in arm64 docker image
 define docker-arm64-run
@@ -119,6 +98,7 @@
 	     source build/setup.sh; m -j$(shell nproc) $2'
 endef
 
+# Test x86 docker ('m docker-test-docker')
 test-docker:
 	@echo "Docker architecture: $(shell uname -a)"
 	@echo "Compiler version: $(shell gcc --version)"
@@ -129,8 +109,6 @@
 
 # Test arm64 docker 'm docker-arm64-test-docker'
 $(call docker-arm64-run,test-docker,test-docker)
-# Test x86 docker 'm docker-test-docker'
-$(call docker-run,test-docker,test-docker)
 
 .DEFAULT_GOAL:=docker-all
 
diff --git a/kokoro/rootfs.sh b/kokoro/rootfs.sh
index d215363..459b656 100644
--- a/kokoro/rootfs.sh
+++ b/kokoro/rootfs.sh
@@ -12,8 +12,8 @@
 export FETCH_PACKAGES=false
 export PREBUILT_DOCKER_ROOT=$KOKORO_GFILE_DIR
 
-m docker-bootstrap
-m docker-rootfs
+m docker-bootstrap-tarball
+m docker-rootfs_raw
 
 cp git/cache/debootstrap.tgz $KOKORO_ARTIFACTS_DIR
 cp git/cache/debootstrap.tgz.sha256sum $KOKORO_ARTIFACTS_DIR