diff --git a/.github/workflows/webapp-build.yml b/.github/workflows/webapp-build.yml
index c49ebe012..f331aab60 100644
--- a/.github/workflows/webapp-build.yml
+++ b/.github/workflows/webapp-build.yml
@@ -3,11 +3,13 @@ name: Build WebApp
 on:
     push:
         tags:
-            - 'v3.[0-9]+.[0-9]+'
+            # Only run on tags with the format v3.x.x or v3.x.x-someextra
+            - 'v3.[0-9]+.[0-9]+(-[A-Za-z0-9.-]*)?$'
 
 env:
-    WEBAPP_PACKAGE_NAME: webapp.tar.gz
+    WEBAPP_PACKAGE_NAME: webapp-${{  github.ref_name }}.tar.gz
     WEBAPP_ROOT_PATH: ./src/webapp/
+    TAG_NAME: ${{  github.ref_name }}
 
 jobs:
   build: