diff --git a/Dockerfile b/Dockerfile
index c336f949..c4fbcef8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,10 +41,6 @@ RUN --mount=type=cache,id=gomod,target=/go/pkg/mod \
     --mount=type=cache,id=gobuild,target=/root/.cache/go-build \
     ./scripts/build
 
-COPY ./scripts/package ./scripts/entry ./scripts/
-COPY ./package ./package
-CMD ./scripts/entry package
-
 FROM scratch as binary
 ENV SRC_DIR=/go/src/github.com/k3s-io/kine
 COPY --from=build ${SRC_DIR}/bin /bin
\ No newline at end of file
diff --git a/Makefile b/Makefile
index bc851a4e..305746b5 100644
--- a/Makefile
+++ b/Makefile
@@ -20,16 +20,18 @@ ifneq ($(DIRTY),)
 	DIRTY="-dirty"
 endif
 
-.PHONY: no-dapper
-no-dapper:
+.PHONY: validate
+validate:
 	DOCKER_BUILDKIT=1 docker build \
 		$(DEFAULT_BUILD_ARGS) --build-arg="SKIP_VALIDATE=$(SKIP_VALIDATE)" \
 		--target=validate -f Dockerfile .
-	DOCKER_BUILDKIT=1 docker build \
-		$(DEFAULT_BUILD_ARGS) --build-arg="DRONE_TAG=$(DRONE_TAG)" --build-arg="CROSS=$(CROSS)" \
-		-f Dockerfile --target=build -t kine-build . 
+
+.PHONY: build
+build:
 	DOCKER_BUILDKIT=1 docker build \
 		$(DEFAULT_BUILD_ARGS) --build-arg="DRONE_TAG=$(DRONE_TAG)" --build-arg="CROSS=$(CROSS)" \
 		-f Dockerfile --target=binary --output=. .
-	DOCKER_BUILDKIT=1 docker run -v /var/run/docker.sock:/var/run/docker.sock -v ./dist:/go/src/github.com/k3s-io/kine/dist \
-		-e DAPPER_UID=1000 -e DAPPER_GID=1000 -e IMAGE_NAME -e DRONE_TAG -e DIRTY=$(DIRTY) kine-build
\ No newline at end of file
+
+.PHONY: no-dapper
+no-dapper: validate build
+	./scripts/package
\ No newline at end of file