diff --git a/.github/workflows/public_docker_images.yml b/.github/workflows/public_docker_images.yml
index 25f8194db..30665fbcd 100644
--- a/.github/workflows/public_docker_images.yml
+++ b/.github/workflows/public_docker_images.yml
@@ -2,12 +2,12 @@
 #
 name: Docker image on ghcr.io
 
-# Configures this workflow to run every time a change is pushed to the branch called `release`.
 on:
   push:
-    branches: ['release']
+    branches: main
+  pull_request:
+    branches: main
 
-# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
@@ -45,4 +45,4 @@ jobs:
         with:
           context: .
           push: false  # TODO: CHANGE ME
-          tags: $framework-py$python-$doctr_version
+          tags: ${{ matrix.framework }}-py${{ matrix.python }}-${{ matrix.doctr_version }}