diff --git a/Dockerfile b/Dockerfile
index c99e7fb..c9fee29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,7 @@ RUN apt-get --yes update && apt-get install --yes --no-install-recommends make
 COPY configuration.json /app/configuration.json
 COPY vendor /app/vendor
 COPY Makefile /app/Makefile
-RUN make -C /app prepare REGISTRY=/usr/bin
-RUN sourcemeta-registry-index /app/configuration.json /app/index
+RUN make -C /app prepare index REGISTRY=/usr/bin OUTPUT=/app/index
 
 FROM scratch
 COPY --from=builder /usr/bin/sourcemeta-registry-server \
diff --git a/Makefile b/Makefile
index 3fb7ed2..0f04bcc 100644
--- a/Makefile
+++ b/Makefile
@@ -12,18 +12,17 @@ LDD ?= ldd
 endif
 
 .PHONY: all
-all: dev
+all: prepare index
+	$(REGISTRY)/sourcemeta-registry-server $(OUTPUT)
 
 .PHONY: prepare
 prepare:
-	@echo "Running prepare steps"
 	$(LDD) $(REGISTRY)/sourcemeta-registry-index
 	$(LDD) $(REGISTRY)/sourcemeta-registry-server
 
-.PHONY: dev
-dev: configuration.json prepare
+.PHONY: index
+index: configuration.json
 	$(REGISTRY)/sourcemeta-registry-index $< $(OUTPUT)
-	$(REGISTRY)/sourcemeta-registry-server $(OUTPUT)
 
 .PHONY: clean
 clean: