diff --git a/Makefile b/Makefile
index 6ff99c72..8f3d2fc2 100644
--- a/Makefile
+++ b/Makefile
@@ -321,13 +321,14 @@ run-container:
 		zot-build:latest 
 
 .PHONY: binary-stacker
-binary-stacker:
+binary-stacker: $(STACKER)
 	${STACKER} --debug build \
 		-f build/stacker.yaml \
-		--substitute PWD=$$PWD \
-		--substitute COMMIT=$$COMMIT \
-		--substitute ARCH=$$ARCH \
-		--substitute OS=$$OS
+		--substitute COMMIT=$(COMMIT) \
+		--substitute ARCH=$(ARCH) \
+		--substitute OS=$(OS) \
+		--substitute RELEASE_TAG=$(RELEASE_TAG) \
+		--substitute REPO_NAME=zot-$(OS)-$(ARCH)
 
 .PHONY: image
 image:
diff --git a/build/stacker.yaml b/build/stacker.yaml
index 656449ed..77999aa7 100644
--- a/build/stacker.yaml
+++ b/build/stacker.yaml
@@ -13,7 +13,7 @@ build:
     cd /go/src/github.com/project-zot
     git clone /zotcopy zot
     cd /go/src/github.com/project-zot/zot
-    make COMMIT=${{COMMIT}} OS=${{OS}} ARCH=${{ARCH}} RELEASE_TAG=${{RELEASE_TAG}} clean binary${{EXT:}}
+    make COMMIT=${{COMMIT}} OS=${{OS}} ARCH=${{ARCH}} RELEASE_TAG=${{RELEASE_TAG}} clean binary
     cat > config.json << EOF
     {
       "storage":{
@@ -49,7 +49,7 @@ build:
 
     mkdir -p binary/ cert/ config/
 
-    cp /go/src/github.com/project-zot/zot/bin/zot-${{OS}}-${{ARCH}}${{EXT:}} binary/
+    cp /go/src/github.com/project-zot/zot/bin/zot-${{OS}}-${{ARCH}} binary/
     cp /go/src/github.com/project-zot/zot/config.json config/
     cp /etc/ssl/certs/ca-certificates.crt cert/
   build_only: true
@@ -68,7 +68,7 @@ build:
     - source: ../.build/${{REPO_NAME}}/config
       dest: /etc/zot
   entrypoint:
-    - /usr/local/bin/zot-${{OS}}-${{ARCH}}${{EXT:}}
+    - /usr/local/bin/zot-${{OS}}-${{ARCH}}
   volumes:
     - /var/lib/registry
   cmd: