diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml
index 8b3202d75..678c3513e 100644
--- a/.github/workflows/container-release.yml
+++ b/.github/workflows/container-release.yml
@@ -11,7 +11,6 @@ on:
       - invidious.service
       - .git*
       - .editorconfig
-
       - screenshots/*
       - .github/ISSUE_TEMPLATE/*
       - kubernetes/**
@@ -52,28 +51,52 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
 
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: quay.io/invidious/invidious
+          tags: |
+            type=sha,format=short
+            type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+          labels: |
+            quay.expires-after=12w
+
       - name: Build and push Docker AMD64 image for Push Event
-        if: github.ref == 'refs/heads/master'
         uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/Dockerfile
           platforms: linux/amd64
-          labels: quay.expires-after=12w
+          labels: ${{ steps.meta.outputs.labels }}
           push: true
-          tags: quay.io/invidious/invidious:${{ github.sha }},quay.io/invidious/invidious:latest
+          tags: ${{ steps.meta.outputs.tags }}
           build-args: |
             "release=1"
 
+      - name: Docker meta
+        id: meta-arm64
+        uses: docker/metadata-action@v5
+        with:
+          images: quay.io/invidious/invidious
+          flavor: |
+            suffix=-arm64
+          tags: |
+            type=sha,format=short
+            type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+          labels: |
+            quay.expires-after=12w
+
       - name: Build and push Docker ARM64 image for Push Event
-        if: github.ref == 'refs/heads/master'
         uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/Dockerfile.arm64
           platforms: linux/arm64/v8
-          labels: quay.expires-after=12w
+          labels: ${{ steps.meta-arm64.outputs.labels }}
           push: true
-          tags: quay.io/invidious/invidious:${{ github.sha }}-arm64,quay.io/invidious/invidious:latest-arm64
+          tags: ${{ steps.meta-arm64.outputs.tags }}
           build-args: |
             "release=1"