diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d7f8195c..379ab638 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - "**"
+    tags:
+      - "v*"
   pull_request:
     branches:
       - "**"
@@ -95,6 +97,7 @@ jobs:
   lint:
     if: >
       !failure() && !cancelled()
+      && !contains(github.ref, 'refs/tags/v')
 
     name: Lint
     needs: [init] #needs: [init, deps]
@@ -122,6 +125,7 @@ jobs:
   test:
     if: >
       !failure() && !cancelled()
+      && !contains(github.ref, 'refs/tags/v')
 
     name: Test
     needs: [init, lint]
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index de364a6f..7b7549e2 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -117,7 +117,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["stable"]')[0])
 
-    name: Distro Pkgs
+    name: Distro Packages
     uses: ./.github/workflows/bake.yml
     with:
       bake_targets: '["pkg-deb", "pkg-rpm"]'
@@ -133,8 +133,8 @@ jobs:
       includes: ${{inputs.includes}}
       artifact: >
         {
-          "pkg-deb": {"dst": "tuwunel_1.0.0-1_amd64.deb"},
-          "pkg-rpm": {"dst": "tuwunel-1.0.0-1.x86_64.rpm"}
+          "pkg-deb": {"dst": "tuwunel.deb", "src": "tuwunel_1.0.0-1_amd64.deb"},
+          "pkg-rpm": {"dst": "tuwunel.rpm", "src": "tuwunel-1.0.0-1.x86_64.rpm"}
         }
 
   check_pkgs:
@@ -145,7 +145,7 @@ jobs:
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["stable"]')[0])
       && false
 
-    name: Check Pkgs
+    name: Check Packages
     needs: [pkgs]
     uses: ./.github/workflows/bake.yml
     with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fe36dc40..3adfdd0a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -65,7 +65,7 @@ jobs:
       !failure() && !cancelled()
       && inputs.machines
       && inputs.docker_repo != ''
-      && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))
+      && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/v'))
 
     name: Containers
     runs-on: ${{matrix.machine}}
@@ -115,8 +115,8 @@ jobs:
           acct: ${{github.actor}}
           repo: ${{github.repository}}
           docker_repo: ${{inputs.docker_repo}}
-          docker_tag_latest: ${{ contains(github.ref, 'refs/tags/') && !contains(github.ref, '-rc') }}
-          docker_tag_preview: ${{ contains(github.ref, 'refs/tags/') && contains(github.ref, '-rc') }}
+          docker_tag_latest: ${{ contains(github.ref, 'refs/tags/v') && !contains(github.ref, '-rc') }}
+          docker_tag_preview: ${{ contains(github.ref, 'refs/tags/v') && contains(github.ref, '-rc') }}
 
         run: |
           docker/bake.sh "${{matrix.bake_target}}"