diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 875d196..730547d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,14 +21,20 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Generate Tag Name
+        uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: kchason/rdf-toolkit-normalizer:${{ github.ref_name }}
+
       - name: Build and Push Latest
         uses: docker/build-push-action@v6
         with:
           push: true
           tags: kchason/rdf-toolkit-normalizer:latest
 
-      - name: Build and Push Latest
+      - name: Build and Push Tag
         uses: docker/build-push-action@v6
         with:
           push: true
-          tags: kchason/rdf-toolkit-normalizer:${GITHUB_REF_NAME}
+          tags: ${{ steps.meta.outputs.tags }}