diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 3c47692ac..d82d43cbf 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -73,6 +73,7 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
           flavor: |
+            latest=false
             prefix=${{ matrix.prom_arch }}-
       - name: Set env
         run: echo "GIT_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
@@ -129,3 +130,12 @@ jobs:
           docker manifest annotate ${IMAGE}:${TAG} ${IMAGE}:arm64-${TAG} --arch arm64
           docker manifest annotate ${IMAGE}:${TAG} ${IMAGE}:amd64-${TAG} --arch amd64
           docker manifest push     ${IMAGE}:${TAG}
+      - name: Push latest to tip tag.
+        if: github.ref == 'refs/heads/master'
+        run: |
+          TAG=${{ steps.arroyo-docker.outputs.version }}
+          IMAGE=ghcr.io/arroyosystems/arroyo-${{ matrix.image_type }}
+          docker manifest create   ${IMAGE}:tip ${IMAGE}:arm64-${TAG} ${IMAGE}:amd64-${TAG}
+          docker manifest annotate ${IMAGE}:tip ${IMAGE}:arm64-${TAG} --arch arm64
+          docker manifest annotate ${IMAGE}:tip ${IMAGE}:amd64-${TAG} --arch amd64
+          docker manifest push     ${IMAGE}:tip