diff --git a/.github/workflows/publishBranches.yml b/.github/workflows/publishBranchesPRs.yml
similarity index 94%
rename from .github/workflows/publishBranches.yml
rename to .github/workflows/publishBranchesPRs.yml
index ea4646b..09148d8 100644
--- a/.github/workflows/publishBranches.yml
+++ b/.github/workflows/publishBranchesPRs.yml
@@ -1,9 +1,13 @@
 #
-name: Create and publish a Docker image on a branch
+name: PR - Create and publish a Docker image
 
-# Configures this workflow to run every time a change is pushed to the branch called `master`.
+# Build when a PR is created
 on:
-  push
+  pull_request:
+  #push:
+  #  branches: 
+  #    - '*'
+  #    - '!master'
 
 # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publishMaster.yml
similarity index 98%
rename from .github/workflows/publish.yml
rename to .github/workflows/publishMaster.yml
index e5082cf..8abddac 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publishMaster.yml
@@ -1,5 +1,5 @@
 #
-name: Create and publish a Docker image on master
+name: Master - Create and publish a Docker image
 
 # Configures this workflow to run every time a change is pushed to the branch called `master`.
 on:
diff --git a/.github/workflows/publishTags.yml b/.github/workflows/publishTags.yml
new file mode 100644
index 0000000..4dd9245
--- /dev/null
+++ b/.github/workflows/publishTags.yml
@@ -0,0 +1,50 @@
+#
+name: Tags - Create and publish a Docker image
+
+# Build when a tag is created
+on:
+  push:
+    tags:        
+      - '**'
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
+      # 
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: ${{ github.ref_name }}
+      # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
+      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
+      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}