diff --git a/.github/workflows/docker-arm.yml b/.github/workflows/docker-arm.yml
deleted file mode 100644
index 7a3fd1114..000000000
--- a/.github/workflows/docker-arm.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Docker Build (armv7)
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master    
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up Docker Buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
-      -
-        name: Available platforms
-        run: echo ${{ steps.build.outputs.platforms }}
-      -
-        name: Build
-        run: |
-          docker buildx build \
-            --platform linux/arm/v7 \
-            -t current \
-            --load .
-      -
-        name: Login to DockerHub Registry
-        if: success() && github.ref == 'refs/heads/master'
-        run: echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-      -
-        name: Tag as latest-arm
-        if: success() && github.ref == 'refs/heads/master'
-        run: |
-          docker tag current kegbot/server:latest-arm
-      -
-        name: Publish
-        if: success() && github.ref == 'refs/heads/master'
-        run: |
-          docker push kegbot/server:latest-arm
diff --git a/.github/workflows/docker-amd64.yml b/.github/workflows/docker.yml
similarity index 94%
rename from .github/workflows/docker-amd64.yml
rename to .github/workflows/docker.yml
index f31f1b5cd..d77594c3f 100644
--- a/.github/workflows/docker-amd64.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: Docker Build (amd64)
+name: Docker Build
 
 on:
   push:
@@ -28,7 +28,7 @@ jobs:
         name: Build
         run: |
           docker buildx build \
-            --platform linux/amd64 \
+            --platform linux/amd64,linux/arm/v7 \
             -t current \
             --load .
       -