diff --git a/Makefile b/Makefile
index a6496f9..a2493af 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ endif
 all: build
 
 build:
-	podman build --rm --squash-all --build-arg BASE=$(BASE) -t $(REPOSITORY):latest .
+	podman build --rm --squash-all --build-arg BASE=$(BASE) -t $(REPOSITORY):$(TAG) -t $(REPOSITORY):latest .
 
 push:
 	aws ecr-public get-login-password --region us-east-1 | podman login --username AWS --password-stdin $(REGISTRY)
@@ -26,4 +26,4 @@ push:
 	podman push $(REGISTRY)/$(REPOSITORY):latest
 
 scan:
-	trivy $(TRIVY_OPTS) $(TAG)
+	trivy $(TRIVY_OPTS) $(REPOSITORY):$(TAG)