diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml
index 812bf33..2bc9f92 100644
--- a/.github/workflows/vib-build.yml
+++ b/.github/workflows/vib-build.yml
@@ -2,17 +2,22 @@ name: Vib Build
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - 'main'
+    tags:
+      - '*'
   workflow_dispatch:
+  pull_request:
 
 env:
-    REGISTRY_USER: ${{ github.actor }}
-    REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+  BUILDX_NO_DEFAULT_ATTESTATIONS: 1
 
-jobs:
+permissions:
+    contents: write # Allow actions to create release
+    packages: write # Allow pushing images to GHCR
 
+jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -20,12 +25,51 @@ jobs:
 
     - uses: vanilla-os/vib-gh-action@v0.7.0
 
-    - name: Build the Docker image
-      run: docker image build -f Containerfile --tag ghcr.io/vanilla-os/waydroid:main .
+    - uses: actions/upload-artifact@v4
+      with:
+         name: Containerfile
+         path: Containerfile
 
-    # Push the image to GHCR (Image Registry)
-    - name: Push To GHCR
-      if: github.repository == 'vanilla-os/waydroid-image'
+    - name: Generate image name
       run: |
-        docker login ghcr.io -u ${{ env.REGISTRY_USER }} -p ${{ env.REGISTRY_PASSWORD }}
-        docker image push "ghcr.io/vanilla-os/waydroid:main"
+        REPO_OWNER_LOWERCASE="$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')"
+        echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV"
+        echo "IMAGE_NAME=ghcr.io/$REPO_OWNER_LOWERCASE/waydroid" >> "$GITHUB_ENV"
+
+    - name: Docker meta
+      id: docker_meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          ${{ env. IMAGE_NAME }}
+        tags: |
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{raw}}
+          type=semver,pattern=v{{major}}
+          type=ref,event=branch
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Package Registry
+      uses: docker/login-action@v3
+      if: ${{ github.event_name == 'push' }}
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and Push the Docker image
+      id: push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: Containerfile
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.docker_meta.outputs.tags }}
+        labels: ${{ steps.docker_meta.outputs.labels }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        platforms: linux/amd64
+        provenance: false
diff --git a/.github/workflows/vib-pr.yml b/.github/workflows/vib-pr.yml
deleted file mode 100644
index 045da9e..0000000
--- a/.github/workflows/vib-pr.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Vib PR
-
-on:
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - uses: vanilla-os/vib-gh-action@v0.7.0
-
-    - name: Build the Docker image
-      run: docker image build -f Containerfile --tag vanillaos/waydroid .
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: Containerfile
-        path: Containerfile