diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 92c3e19ea..0c501fa02 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -23,6 +23,9 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: samgoldman/ci-builder:latest
+          tags: |
+            type=raw,value=latest
+            type=schedule,pattern={{date 'YYYYMMDD'}}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
@@ -30,6 +33,6 @@ jobs:
           context: ./ops/ci-builder/
           file: ./ops/ci-builder/Dockerfile
           push: true
-          tags: samgoldman/ci-builder:latest, samgoldman/ci-builder:${{github.event.after}}
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64