diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a563d6d..c7d5fcf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,9 +12,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - name: Sign into Docker
         run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-      - name: Build Docker image
-        run: docker build -t justintime50/glass:${GITHUB_REF##*/v} --build-arg PROD=true --platform linux/amd64,linux/arm64 .
-      - name: Push image to Registry
-        run: docker push justintime50/glass:${GITHUB_REF##*/v}
+      - name: Build Docker image and push to Docker Hub
+        run: docker buildx build --push -t justintime50/glass:${GITHUB_REF##*/v} --build-arg PROD=true --platform linux/amd64,linux/arm64 .
diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml
index ee3f639..462a2aa 100644
--- a/.github/workflows/latest.yml
+++ b/.github/workflows/latest.yml
@@ -11,9 +11,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - name: Sign into Docker
         run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
       - name: Build latest Docker image and push to Docker Hub
-        run: docker build -t justintime50/glass --build-arg PROD=true --platform linux/amd64,linux/arm64 .
-      - name: Push image to Registry
-        run: docker push justintime50/glass
+        run: docker buildx build --push -t justintime50/glass --build-arg PROD=true --platform linux/amd64,linux/arm64 .