diff --git a/apps/rpuppy/Dockerfile b/apps/rpuppy/Dockerfile
index 5b5f85e..0e425c5 100644
--- a/apps/rpuppy/Dockerfile
+++ b/apps/rpuppy/Dockerfile
@@ -1,6 +1,5 @@
-FROM alpine:latest
+FROM gcr.io/distroless/static:nonroot
 
 ARG TARGETARCH
 
 COPY rpuppy_${TARGETARCH} /usr/bin/rpuppy
-RUN chmod +x /usr/bin/rpuppy
diff --git a/apps/rpuppy/Makefile b/apps/rpuppy/Makefile
index 444930b..a85dbda 100644
--- a/apps/rpuppy/Makefile
+++ b/apps/rpuppy/Makefile
@@ -1,3 +1,9 @@
+repo_name ?= dtabidze
+podman ?= docker
+ifeq ($(podman), podman)
+manifest_dest=docker://docker.io/$(repo_name)/rpuppy:latest
+endif
+
 clean:
 	rm -f rpuppy
 
@@ -16,14 +22,14 @@
 	go build -o rpuppy_amd64 *.go
 
 push_arm64: clean build_arm64
-	podman build --platform linux/arm64 --tag=giolekva/rpuppy:arm64 .
-	podman push giolekva/rpuppy:arm64
+	$(podman) build --platform linux/arm64 --tag=$(repo_name)/rpuppy:arm64 .
+	$(podman) push $(repo_name)/rpuppy:arm64
 
 push_amd64: clean build_amd64
-	podman build --platform linux/amd64 --tag=giolekva/rpuppy:amd64 .
-	podman push giolekva/rpuppy:amd64
+	$(podman) build --platform linux/amd64 --tag=$(repo_name)/rpuppy:amd64 .
+	$(podman) push $(repo_name)/rpuppy:amd64
 
 push: push_arm64 push_amd64
-	podman manifest create giolekva/rpuppy:latest giolekva/rpuppy:arm64 giolekva/rpuppy:amd64
-	podman manifest push giolekva/rpuppy:latest docker://docker.io/giolekva/rpuppy:latest
-	podman manifest rm giolekva/rpuppy:latest
+	$(podman) manifest create $(repo_name)/rpuppy:latest $(repo_name)/rpuppy:arm64 $(repo_name)/rpuppy:amd64
+	$(podman) manifest push $(repo_name)/rpuppy:latest $(manifest_dest)
+	$(podman) manifest rm $(repo_name)/rpuppy:latest