diff --git a/.github/workflows/call-docker-build-result.yaml b/.github/workflows/call-docker-build-result.yaml
index a869ecd..8c6d8e5 100644
--- a/.github/workflows/call-docker-build-result.yaml
+++ b/.github/workflows/call-docker-build-result.yaml
@@ -52,7 +52,7 @@ jobs:
       ### defaults to:
       image-names: |
         ghcr.io/dockersamples/example-voting-app-result
-      # dockersamples/examplevotingapp_result
+        dockersamples/examplevotingapp_result
       
       ### REQUIRED set rules for tagging images, based on special action syntax:
       ### https://github.com/docker/metadata-action#tags-input
@@ -60,9 +60,6 @@ jobs:
       tag-rules: |
         type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
         type=ref,event=pr
-        type=ref,event=branch
-        type=semver,pattern={{version}}
-        type=raw,value=gha-${{ github.run_id }}
       
       ### path to where docker should copy files into image
       ### defaults to root of repository (.)
diff --git a/.github/workflows/call-docker-build-vote.yaml b/.github/workflows/call-docker-build-vote.yaml
index 3c8f57f..678d0cc 100644
--- a/.github/workflows/call-docker-build-vote.yaml
+++ b/.github/workflows/call-docker-build-vote.yaml
@@ -52,17 +52,14 @@ jobs:
       ### defaults to:
       image-names: |
         ghcr.io/dockersamples/example-voting-app-vote
-      # dockersamples/examplevotingapp_vote
+        dockersamples/examplevotingapp_vote
       
       ### REQUIRED set rules for tagging images, based on special action syntax:
       ### https://github.com/docker/metadata-action#tags-input
       ### defaults to:
-      # tag-rules: |
-      #   type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
-      #   type=ref,event=pr
-      #   type=ref,event=branch
-      #   type=semver,pattern={{version}}
-      #   type=raw,value=gha-${{ github.run_id }}
+      tag-rules: |
+        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
+        type=ref,event=pr
       
       ### path to where docker should copy files into image
       ### defaults to root of repository (.)
diff --git a/.github/workflows/call-docker-build-worker.yaml b/.github/workflows/call-docker-build-worker.yaml
index c10d9c6..5abfb6b 100644
--- a/.github/workflows/call-docker-build-worker.yaml
+++ b/.github/workflows/call-docker-build-worker.yaml
@@ -52,17 +52,14 @@ jobs:
       ### defaults to:
       image-names: |
         ghcr.io/dockersamples/example-voting-app-worker
-      # dockersamples/examplevotingapp_worker
+        dockersamples/examplevotingapp_worker
       
       ### REQUIRED set rules for tagging images, based on special action syntax:
       ### https://github.com/docker/metadata-action#tags-input
       ### defaults to:
-      # tag-rules: |
-      #   type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
-      #   type=ref,event=pr
-      #   type=ref,event=branch
-      #   type=semver,pattern={{version}}
-      #   type=raw,value=gha-${{ github.run_id }}
+      tag-rules: |
+        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
+        type=ref,event=pr
       
       ### path to where docker should copy files into image
       ### defaults to root of repository (.)
@@ -78,7 +75,7 @@ jobs:
       ### other options: linux/amd64,linux/arm64,linux/arm/v7
       # FIXME worker arm/v7 support doesn't build in .net core 3.1 with QEMU
       # a fix would likely run the .net build on amd64 but with a target of arm/v7
-      platforms: linux/amd64,linux/arm64
+      platforms: linux/amd64,linux/arm64,linux/arm/v7
       
       ### Create a PR comment with image tags and labels
       ### defaults to false