diff --git a/.github/workflows/ghcr-push.yml b/.github/workflows/ghcr-push.yml
index f48e16c..654b61a 100644
--- a/.github/workflows/ghcr-push.yml
+++ b/.github/workflows/ghcr-push.yml
@@ -21,14 +21,20 @@ jobs:
     - uses: actions/checkout@v4
       name: Checkout
 
+    - name: Set Environment
+      run: |
+        echo "SLUG=ghcr.io/cwpearson/clang-format-16" >> $GITHUB_ENV
+        echo "DATE=$(date +"%Y%m%d")" >> $GITHUB_ENV
+
     - name: Build
       run: |
-        docker build -f clang-format-16.dockerfile -t ghcr.io/cwpearson/clang-format-16:latest .
+        docker build -f clang-format-16.dockerfile -t "$SLUG:latest" -t "$SLUG:$DATE" .
 
     - name: Publish to GHCR
       run: |
         echo '${{secrets.GHCR_TOKEN}}' | docker login ghcr.io -u cwpearson --password-stdin
-        docker push ghcr.io/cwpearson/clang-format-16:latest
+        docker push "$SLUG:latest"
+        docker push "$SLUG:$DATE"
   build-8:
     name: Build + Publish 8
     runs-on: ubuntu-latest
@@ -40,11 +46,17 @@ jobs:
     - uses: actions/checkout@v4
       name: Checkout
 
+    - name: Set Environment
+      run: |
+        echo "SLUG=ghcr.io/cwpearson/clang-format-8" >> $GITHUB_ENV
+        echo "DATE=$(date +"%Y%m%d")" >> $GITHUB_ENV
+
     - name: Build
       run: |
-        docker build -f clang-format-8.dockerfile -t ghcr.io/cwpearson/clang-format-8:latest .
+        docker build -f clang-format-8.dockerfile -t "$SLUG:latest" -t "$SLUG:$DATE" .
 
     - name: Publish to GHCR
       run: |
         echo '${{secrets.GHCR_TOKEN}}' | docker login ghcr.io -u cwpearson --password-stdin
-        docker push ghcr.io/cwpearson/clang-format-8:latest
+        docker push "$SLUG:latest"
+        docker push "$SLUG:$DATE"