diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml
index 02fe856970..e099794b8a 100644
--- a/.github/workflows/bun.yml
+++ b/.github/workflows/bun.yml
@@ -94,6 +94,11 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: jarredsumner
+          password: ${{ secrets.DOCKERHUB_ALT }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
         with:
@@ -103,6 +108,18 @@ jobs:
         with:
           context: .
           target: release
-          tags: ghcr.io/jarred-sumner/bun:${{github.sha}}
+          tags: |
+            ghcr.io/jarred-sumner/bun:${{github.sha}}
+            ghcr.io/jarred-sumner/bun:edge
+            jarredsumner/bun:${{github.sha}}
+            jarredsumner/bun:edge
+          platforms: |
+            linux/amd64
+          labels: |
+            org.opencontainers.image.title=Bun
+            org.opencontainers.image.description=Bun is a fast bundler, transpiler, JavaScript Runtime environment and package manager for web software. This is the official docker image for Bun.\n The image is an Ubuntu 20.04 image with bun preinstalled into /opt/bun.
+            org.opencontainers.image.vendor=Bun
+            org.opencontainers.image.source=https://github.com/Jarred-Sumner/bun
+            org.opencontainers.image.url=https://bun.sh
           builder: ${{ steps.buildx.outputs.name }}
           push: true