diff --git a/tools/go-compile/Makefile b/tools/go-compile/Makefile
index 1f0995e2a..3caba19e1 100644
--- a/tools/go-compile/Makefile
+++ b/tools/go-compile/Makefile
@@ -1,15 +1,4 @@
-.PHONY: tag push
-default: push
+include ../../pkg/package.mk
 
-ORG?=linuxkit
 IMAGE=go-compile
-DEPS=Dockerfile Makefile compile.sh
-
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
-
-tag: $(DEPS)
-	docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
+DEPS=compile.sh