diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 4237f6f..fbc0976 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -23,9 +23,10 @@ jobs:
         with:
           images: ${{ vars.DOCKER_ORG }}/${{ github.event.repository.name }}
           tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            # set latest tag for master branch
+            type=ref,event=branch            
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            # set 'latest' tag for main branch
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       - name: Build and push Docker image
diff --git a/tfc-dump.pl b/tfc-dump.pl
index 53c034c..81f1149 100755
--- a/tfc-dump.pl
+++ b/tfc-dump.pl
@@ -158,7 +158,7 @@
 
 # Get the number of Variable Sets
 
-$jq_cmd      = "cat $tmpfile | jq '.meta.total-count'";
+$jq_cmd      = "cat $tmpfile | jq '.meta.pagination[\"total-count\"]'";
 $total_count = `$jq_cmd`;
 unlink($tmpfile);