diff --git a/Dockerfile b/Dockerfile
index 97d906e..b36b37d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,15 @@
 FROM cgr.dev/chainguard/wolfi-base
 
 RUN apk add --no-cache tini bash
+RUN mkdir -p /configurator
+RUN mkdir -p /configurator/lib
 
 # nobody 65534:65534
 USER 65534:65534
 
 # copy the binary and all of the default plugins
-COPY configurator /configurator
-COPY lib/* /lib/*
+COPY configurator /configurator/configurator
+COPY lib/* /configurator/lib/*
 
 CMD ["/configurator"]
 
diff --git a/Makefile b/Makefile
index 49f7065..f58451d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ exe:
 
 
 docker: binaries plugins
-	docker build -t configurator:latest .
+	docker build . --build-arg REGISTRY_HOST=${REGISTRY_HOST} --no-cache --pull --tag '${NAME}:${VERSION}'
 
 # build all of the generators into plugins
 plugins: