diff --git a/.github/workflows/azurekeycloaktester-container.yaml b/.github/workflows/azurekeycloaktester-container.yaml
index 3b9ddf5..794da2b 100644
--- a/.github/workflows/azurekeycloaktester-container.yaml
+++ b/.github/workflows/azurekeycloaktester-container.yaml
@@ -10,7 +10,7 @@ on:
     # Only release off of release and maintenance branches for this asset
     branches:
       - 'main'
-    # Only consider pushes that change files for this asset, including ci scripts
+    # Only consider pushes that change files for this asset, including ci scripts.
     paths:
       - '.github/workflows/azurekeycloaktester-container.yaml'
       - 'containers/AzureKeycloakTester/**'
diff --git a/.github/workflows/azurekeycloaktester-sonar.yaml b/.github/workflows/azurekeycloaktester-sonar.yaml
index 9427178..8ab2d86 100644
--- a/.github/workflows/azurekeycloaktester-sonar.yaml
+++ b/.github/workflows/azurekeycloaktester-sonar.yaml
@@ -7,13 +7,9 @@ on:
       - '.github/workflows/azurekeycloaktester-sonar.yaml'
       - 'containers/AzureKeycloakTester/**'
   push:
-    # Only release off of release and maintenance branches for this asset
-    branches:
-      - 'main'
-    # Only consider pushes that change files for this asset, including ci scripts
-    paths:
-      - '.github/workflows/azurekeycloaktester-sonar.yaml'
-      - 'containers/AzureKeycloakTester/**'
+    # Only trigger off of relevant release tags
+    tags:
+      - 'v*.*.*-azurekeycloaktester-container'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}