diff --git a/Makefile b/Makefile
index f85393b..af244dd 100644
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,16 @@ bindata:
 	go-bindata -pkg logfile -o ./pkg/logfile/bindata_test.go ./pkg/logfile/test
 
 container-build:
+	$(MAKE) container-run COMMAND=build
+
+container-test:
+	$(MAKE) container-run COMMAND=test
+
+container-run:
 	docker run \
 		--volume ${PWD}:/workspace \
-		volkerraschek/build-image:1.0.0 \
-			make build UID=${UID} GID=${GID} VERSION=${VERSION} GOOS=${GOOS} GOARCH=${GOARCH}
+		volkerraschek/build-image:latest\
+			make ${COMMAND} UID=${UID} GID=${GID} VERSION=${VERSION} GOOS=${GOOS} GOARCH=${GOARCH}
 
 remote:
 	$(MAKE) build GOARCH=arm