diff --git a/Makefile b/Makefile
index 9893430..e685334 100644
--- a/Makefile
+++ b/Makefile
@@ -92,22 +92,22 @@ ifdef SCAN
 	mkdir -p "test-reports/$(TAG_NAME_PREFIX)"
 	trivy image \
 		--format json \
-		--output test-reports/$(TAG_NAME_PREFIX)$$(git rev-parse --short HEAD)-$@.trivy.json \
+		--output test-reports/$(TAG_NAME_PREFIX)$@-$$(git rev-parse --short HEAD).trivy.json \
 		$(TAG_NAME_PREFIX)$@
 ifdef SIGN_SCAN
-	gpg --detach-sign --local-user $(GPG_SIGNER_FINGERPRINT) -v -a --yes test-reports/$(TAG_NAME_PREFIX)$$(git rev-parse --short HEAD)-$@.trivy.json
+	gpg --detach-sign --local-user $(GPG_SIGNER_FINGERPRINT) -v -a --yes test-reports/$(TAG_NAME_PREFIX)$@-$$(git rev-parse --short HEAD).trivy.json
 endif
 endif
 ifdef ARCHIVE
-	export archive_path="$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.tar"; \
-	export manifest_path="$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.manifest.json"; \
+	export archive_path="$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).tar"; \
+	export manifest_path="$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).manifest.json"; \
 	mkdir -p "$$(dirname $$archive_path)" && \
 	docker save -o "$$archive_path" "$(DOCKER_REGISTRY)/$(DOCKER_REPO_SLUG)/$@" && \
 	tar -xf "$$archive_path" manifest.json --to-stdout > $$manifest_path; \
 	gzip -vf "$$archive_path"
 ifdef SIGN_ARCHIVE
-	export archive_path="$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.tar.gz"; \
-	export manifest_path="$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.manifest.json"; \
+	export archive_path="$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).tar.gz"; \
+	export manifest_path="$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).manifest.json"; \
 	gpg --detach-sign --local-user $(GPG_SIGNER_FINGERPRINT) -v -a --yes "$$manifest_path"; \
 	gpg --detach-sign --local-user $(GPG_SIGNER_FINGERPRINT) -v -a --yes "$$archive_path";
 endif
@@ -115,16 +115,16 @@ ifdef PUBLISH_ARCHIVE
 ifndef BITBUCKET_ACCESS_TOKEN
 	$(error BITBUCKET_ACCESS_TOKEN not set)
 endif
-	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.tar.gz)
-	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.manifest.json)
+	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).tar.gz)
+	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).manifest.json)
 ifdef SIGN_ARCHIVE
-	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.tar.gz.asc)
-	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$$(git rev-parse --short HEAD)-$@.manifest.json.asc)
+	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).tar.gz.asc)
+	$(call bitbucket-upload,$(ARCHIVE_PATH_PREFIX)$@-$$(git rev-parse --short HEAD).manifest.json.asc)
 endif
 ifdef SCAN
-	$(call bitbucket-upload,test-reports/$(TAG_NAME_PREFIX)$$(git rev-parse --short HEAD)-$@.trivy.json)
+	$(call bitbucket-upload,test-reports/$(TAG_NAME_PREFIX)$@-$$(git rev-parse --short HEAD).trivy.json)
 ifdef SIGN_SCAN
-	$(call bitbucket-upload,test-reports/$(TAG_NAME_PREFIX)$$(git rev-parse --short HEAD)-$@.trivy.json.asc)
+	$(call bitbucket-upload,test-reports/$(TAG_NAME_PREFIX)$@-$$(git rev-parse --short HEAD).trivy.json.asc)
 endif # SIGN_SCAN
 endif # SCAN
 endif # PUBLISH_ARCHIVE