diff --git a/alpine/packages/hvtools/Dockerfile b/alpine/packages/hvtools/Dockerfile
index b69f9963c..5860c29cc 100644
--- a/alpine/packages/hvtools/Dockerfile
+++ b/alpine/packages/hvtools/Dockerfile
@@ -1,9 +1,8 @@
 FROM mobylinux/alpine-build-c:1b53976210ba819823eda5b1d0d3ea337772e97b
 
-RUN mkdir -p /hvtools
-
 COPY src /hvtools/
-RUN tar czvf /hvtools.tar.gz hvtools
 
 WORKDIR /hvtools
 RUN make
+
+CMD ["tar", "cf", "-", "hv_fcopy_daemon", "hv_kvp_daemon", "hv_vss_daemon"]
diff --git a/alpine/packages/hvtools/Makefile b/alpine/packages/hvtools/Makefile
index 3c1565733..67efe1d72 100644
--- a/alpine/packages/hvtools/Makefile
+++ b/alpine/packages/hvtools/Makefile
@@ -1,13 +1,13 @@
-all: hvtools
+all: hv_fcopy_daemon hvtools.tar.gz
 
-hvtools: Dockerfile src/*
-	docker build -t hvtools:build .
-	docker run --rm hvtools:build cat /hvtools.tar.gz > hvtools.tar.gz
-	docker run --rm hvtools:build cat /hvtools/hv_fcopy_daemon > hv_fcopy_daemon
-	docker run --rm hvtools:build cat /hvtools/hv_kvp_daemon > hv_kvp_daemon
-	docker run --rm hvtools:build cat /hvtools/hv_vss_daemon > hv_vss_daemon
-	chmod 755 hv_fcopy_daemon hv_kvp_daemon hv_vss_daemon
+hv_fcopy_daemon: Dockerfile src/*
+	tar cf - Dockerfile src | docker build -t hvtools:build -
+	docker run --rm --net=none hvtools:build | tar xf -
+
+hvtools.tar.gz: src/*
+	tar czf hvtools.tar.gz src
 
 clean:
-	rm -f hv_fcopy_daemon hv_kvp_daemon hv_vss_daemon
-	docker images -q hvtools:build | xargs docker rmi -f || true
+	rm -f hv_fcopy_daemon hv_kvp_daemon hv_vss_daemon hvtools.tar.gz
+
+.DELETE_ON_ERROR: