diff --git a/.github/workflows/docker-publish-njsPC-linux.yml b/.github/workflows/docker-publish-njsPC-linux.yml
index 053ff7f8..15b2ee4a 100644
--- a/.github/workflows/docker-publish-njsPC-linux.yml
+++ b/.github/workflows/docker-publish-njsPC-linux.yml
@@ -11,6 +11,23 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     steps:
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            treyrich2001/njspc          
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -28,5 +45,5 @@ jobs:
         with:
           push: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: |
-            treyrich2001/njspc:latest
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}