diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b6741d98..d78eeaa4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
 
     - name: Set Build Variables
       run: |
-        echo "REL_VERSION=3.0.0-alpha.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
+        echo "REL_VERSION=3.0.0-beta.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
 
     - name: Set Version
       run: |
@@ -51,6 +51,19 @@ jobs:
         npm ci
         npm run build
 
+    - name: Generate Docker Meta
+      id: meta
+      uses: docker/metadata-action@v6
+      with:
+        flavor: |
+          latest=flase
+        images: |
+          requarks/wiki
+          ghcr.io/requarks/wiki
+        tags: |
+          type=semver,pattern={{version}},value=${{ env.REL_VERSION }}
+          type=raw,value=3.0.0-beta
+
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v4
       with:
@@ -58,6 +71,12 @@ jobs:
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Login to DockerHub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v4
 
@@ -67,11 +86,9 @@ jobs:
         context: .
         file: dev/build/Dockerfile
         push: true
-        # platforms: linux/amd64
         platforms: linux/amd64,linux/arm64
-        tags: |
-          ghcr.io/requarks/wiki:3.0.0-alpha
-          ghcr.io/requarks/wiki:${{ env.REL_VERSION }}
+        tags: ${{ steps.meta.outputs.tags }}
+        annotations: ${{ steps.meta.outputs.annotations }}
 
     - name: Prepare build archive
       run: |