diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml
index b21123d2..3d61928f 100644
--- a/.github/workflows/container-release.yml
+++ b/.github/workflows/container-release.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - "master"
+  pull_request:
+    branches: "*"
 
 jobs:
   release:
@@ -27,7 +29,8 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
 
-      - name: Build and push
+      - name: Build and push latest tag
+        if: github.ref == 'refs/heads/master'
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -35,5 +38,13 @@ jobs:
           push: true
           tags: quay.io/invidious/invidious:latest
 
+      - name: Build and push commit sha tag
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: docker/Dockerfile
+          push: true
+          tags: quay.io/invidious/invidious:${{ github.sha }}
+
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}