diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
index e95fbd58..62b531e9 100644
--- a/.github/workflows/build-staging.yaml
+++ b/.github/workflows/build-staging.yaml
@@ -3,8 +3,10 @@ name: Build latest staging images
 on:
   push:
     branches:
-      - dev
-      - dev-build-images
+      - develop
+  tags:
+    - '*'
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
@@ -77,6 +79,12 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ matrix.image }}
+          tags: |
+            type=edge,branch=develop
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{version}}
+            type=sha
 
       - name: Build and push
         uses: docker/build-push-action@v4