diff --git a/.ci/podman.mk b/.ci/podman.mk
index 95c2fc72..5e3de0bc 100644
--- a/.ci/podman.mk
+++ b/.ci/podman.mk
@@ -12,7 +12,6 @@ endif
 
 all: test
 
-
 build:
 	@docker image exists $(REGISTRY)/$(IMAGE):$(TAG) || \
 		docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG) --build-arg TAG=$(TAG) .
@@ -29,9 +28,7 @@ scan: build
 
 push: build
 	@aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY)
-	@docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):latest
-	docker push $(REGISTRY)/$(IMAGE):$(TAG)
-	docker push $(REGISTRY)/$(IMAGE):latest
+	@for t in $(TAG) latest $(EXTRA_TAGS); do echo "tag and push: $$t"; docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$$t && docker push $(REGISTRY)/$(IMAGE):$$t; done
 
 clean: rm-test-image rm-image