diff --git a/Makefile b/Makefile
index 8fb583c..0ec0316 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,12 @@ all: $(BUILD)/harddrive.img
 
 live: $(BUILD)/livedisk.iso
 
+image:
+	-$(FUMOUNT) $(BUILD)/filesystem/ || true
+	-$(FUMOUNT) /tmp/redox_installer/ || true
+	rm -rf $(BUILD)/harddrive.img
+	$(MAKE) all
+
 rebuild:
 	-$(FUMOUNT) $(BUILD)/filesystem/ || true
 	-$(FUMOUNT) /tmp/redox_installer/ || true
diff --git a/mk/repo.mk b/mk/repo.mk
index ef16224..48818ea 100644
--- a/mk/repo.mk
+++ b/mk/repo.mk
@@ -26,3 +26,13 @@ else
 	touch $<
 	touch $@
 endif
+
+# Invoke repo.sh for a single target
+r.%: FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	cd cookbook && \
+	./repo.sh $*
+endif