diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
new file mode 100644
index 0000000..73f3c08
--- /dev/null
+++ b/.github/workflows/docker.yaml
@@ -0,0 +1,52 @@
+name: Docker
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  buildx:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        context: [ bundler, oba ]
+        include:
+          - name: onebusaway-bundle-builder
+            context: bundler
+          - name: onebusaway-api-webapp
+            context: oba
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.context }}
+      cancel-in-progress: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push images
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ matrix.context }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          # for versioning, use the git sha
+          tags: |
+            aaronbrethorst/${{ matrix.name }}:latest
+            aaronbrethorst/${{ matrix.name }}:${{ github.sha }}