diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
index 65eda7f..103188f 100644
--- a/.github/workflows/build-docker.yaml
+++ b/.github/workflows/build-docker.yaml
@@ -11,35 +11,60 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
             ghcr.io/pooh-bear/intellistar-emulator
+            gabepb/intellistar-emulator
           tags: |
-            type=raw,priority=1000,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,priority=1000,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
+
       - name: Set up Buildx
         uses: docker/setup-buildx-action@v2
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and Push
-        id: docker_build
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and Push to GitHub Container Registry
+        id: ghcr_build
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          pull: true
+          push: ${{ github.ref == 'refs/heads/main' }}
+          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          tags: ghcr.io/pooh-bear/intellistar-emulator:${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build and Push to Docker Hub
+        id: docker_hub_build
         uses: docker/build-push-action@v3
         with:
           context: .
           pull: true
-          push: ${{ github.ref == 'refs/heads/master' }}
+          push: ${{ github.ref == 'refs/heads/main' }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: gabepb/intellistar-emulator:${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
\ No newline at end of file
+          cache-to: type=gha,mode=max
diff --git a/README.md b/README.md
index e3f49a2..8ec740c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # intellistar-emulator
 A web application that displays weather information in the same visual presentation as the cable headend unit [Intellistar](https://en.wikipedia.org/wiki/IntelliStar).
 
+[![build-docker](https://github.com/pooh-bear/intellistar-emulator/actions/workflows/build-docker.yaml/badge.svg)](https://github.com/pooh-bear/intellistar-emulator/actions/workflows/build-docker.yaml)  
+
 ## Overview
 This is a local forecast segment that airs on The Weather Channel called the "Local on the 8s". The name is because it airs at timeslots that end in "8" (9:28, 2:48, etc.). The forecast is approximately a minute long and provides information on current and forecasted weather conditions. This type of forecast started in 1982 using WeatherStar units. It was later upgraded to Intellistar in 2003 and received various graphic changes over the years. This emulator uses the style that started in 2013.