diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml
index b1a04f269..1859f082a 100644
--- a/.github/workflows/container-release.yml
+++ b/.github/workflows/container-release.yml
@@ -9,7 +9,6 @@ on:
 
 jobs:
   release:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -29,16 +28,18 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
 
-      - name: Build and push latest tag
+      - name: Build and push for Push Event
         if: github.ref == 'refs/heads/master'
         uses: docker/build-push-action@v2
         with:
           context: .
           file: docker/Dockerfile
+          labels: quay.expires-after=12w
           push: true
-          tags: quay.io/invidious/invidious:latest
+          tags: quay.io/invidious/invidious:${{ github.sha }},quay.io/invidious/invidious:latest
 
-      - name: Build and push commit sha tag
+      - name: Build and push for Pull Request
+        if: github.ref != 'refs/heads/master'
         uses: docker/build-push-action@v2
         with:
           context: .