diff --git a/.github/workflows/docker_hub.yml b/.github/workflows/docker_hub.yml
index d638068..41839a9 100644
--- a/.github/workflows/docker_hub.yml
+++ b/.github/workflows/docker_hub.yml
@@ -19,16 +19,18 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
 
       - name: Docker Login
-        uses: docker/login-action@v1.6.0
+        uses: azure/docker-login@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
@@ -37,7 +39,8 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          tags: evanbuss/openbooks:latest
+          platforms: linux/amd64,linux/arm64
+          tags: evanbuss/openbooks:latest,evanbuss/openbooks:${GITHUB_SHA::8}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
index adc6ece..957487f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM node:lts as web
+FROM node:16 as web
 WORKDIR /web
 COPY . .
 WORKDIR /web/server/app/
 RUN npm install
 RUN npm run build
 
-FROM golang:rc-alpine3.13 as build
+FROM golang as build
 WORKDIR /go/src/
 COPY . .
 COPY --from=web /web/ .