diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
index 14dc9006..f76434a8 100644
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -76,6 +76,18 @@ jobs:
         labels: ${{ steps.meta.outputs.labels }}
         platforms: linux/amd64,linux/arm64/v8
 
+    - name: Generate tags
+      id: meta2
+      uses: docker/metadata-action@v4.4.0
+      with:
+        images: |
+          ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+          ghcr.io/${{ github.repository_owner }}/s-pdf
+        tags: |
+          ${{ steps.versionNumber.outputs.versionNumber }}-ultra-light
+          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+          type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
+          
     - name: Convert repository owner to lowercase
       id: repoowner
       run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')"
@@ -88,14 +100,15 @@ jobs:
         push: true
         cache-from: type=gha
         cache-to: type=gha,mode=max
+        tags: ${{ steps.meta2.outputs.tags }}
+        labels: ${{ steps.meta2.outputs.labels }}
         tags: |
           ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf:ultra-light-latest
           ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf:ultra-light-latest
         labels: |
-          ${{ steps.meta.outputs.labels }}
+          ${{ steps.meta2.outputs.labels }}
           type=raw,value=ultra-light-latest,enable=${{ github.ref == 'refs/heads/master' }}
           type=raw,value=ultra-light-alpha,enable=${{ github.ref == 'refs/heads/main' }}
         platforms: linux/amd64,linux/arm64/v8
 
 
-