diff --git a/.github/workflows/build-testflinger-testenv-container.yml b/.github/workflows/build-testflinger-testenv-container.yml
index 5465b530..96da9fe3 100644
--- a/.github/workflows/build-testflinger-testenv-container.yml
+++ b/.github/workflows/build-testflinger-testenv-container.yml
@@ -7,6 +7,7 @@ on:
       - testflinger-testenv
     paths:
       - agent/extra/testflinger-testenv/**
+      - .github/workflows/build-testflinger-testenv-container.yml
   workflow_dispatch:
 
 env:
@@ -47,8 +48,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.base_version }}
+          tags: ${{ matrix.version }}
 
       - name: Build and push backend Docker image
         uses: docker/build-push-action@v6