diff --git a/Makefile b/Makefile
index 7df8e28..30c6ac0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-BASE ?= latest-alpine-jdk11
 REGISTRY := public.ecr.aws/zero-downtime
 REPOSITORY := jenkins-podman
+REGION := us-east-1
 
 # Parse version from latest git semver tag
-GTAG=$(shell git describe --tags --match v*.*.* 2>/dev/null || echo "v0.0.0")
+GTAG=$(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
 TAG ?= $(shell echo $(GTAG) | awk -F '-' '{ print $$1 "-" $$2 }' | sed -e 's/-$$//')
 
 ifeq ($(TRIVY_REMOTE),)
@@ -12,15 +12,15 @@ else
 	TRIVY_OPTS := client --remote ${TRIVY_REMOTE}
 endif
 
-.PHONY: build push scan
+.PHONY: build push scan test
 
 all: build
 
 build:
-	podman build --rm --squash-all --build-arg BASE=$(BASE) -t $(REPOSITORY):$(TAG) -t $(REPOSITORY):latest .
+	podman build --rm --squash-all -t $(REPOSITORY):$(TAG) -t $(REPOSITORY):latest .
 
 push:
-	aws ecr-public get-login-password --region us-east-1 | podman login --username AWS --password-stdin $(REGISTRY)
+	aws ecr-public get-login-password --region $(REGION) | podman login --username AWS --password-stdin $(REGISTRY)
 	podman tag $(REPOSITORY):latest $(REGISTRY)/$(REPOSITORY):$(TAG) $(REGISTRY)/$(REPOSITORY):latest
 	podman push $(REGISTRY)/$(REPOSITORY):$(TAG)
 	podman push $(REGISTRY)/$(REPOSITORY):latest
@@ -29,3 +29,4 @@ scan:
 	trivy $(TRIVY_OPTS) $(REPOSITORY):$(TAG)
 
 test:
+	@echo "Not implemented (yet)"
diff --git a/html.tpl b/html.tpl
index 2620279..0fe885f 100644
--- a/html.tpl
+++ b/html.tpl
@@ -96,6 +96,7 @@
         <th>Severity</th>
         <th>Installed Version</th>
         <th>Fixed Version</th>
+        <th>Title</th>
         <th>Links</th>
       </tr>
         {{- range .Vulnerabilities }}
@@ -105,6 +106,7 @@
         <td class="severity">{{ escapeXML .Vulnerability.Severity }}</td>
         <td class="pkg-version">{{ escapeXML .InstalledVersion }}</td>
         <td>{{ escapeXML .FixedVersion }}</td>
+        <td>{{ escapeXML .Title }}</td>
         <td class="links" data-more-links="off">
           {{- range .Vulnerability.References }}
           <a href={{ escapeXML . | printf "%q" }} target="_blank" rel="noopener noreferrer">{{ escapeXML . }}</a>