diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 765c81d6c00..dce552df7d2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,6 +1,13 @@
 name: Docker
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    types: [opened, synchronize, reopened]
+  release:
+    types: [published]
 
 jobs:
   build:
diff --git a/.github/workflows/docker_build_push.sh b/.github/workflows/docker_build_push.sh
index 7f935af18b9..3f7bfdc62af 100755
--- a/.github/workflows/docker_build_push.sh
+++ b/.github/workflows/docker_build_push.sh
@@ -24,6 +24,9 @@ if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
   REFSPEC="${GITHUB_HEAD_REF/[^a-zA-Z0-9]/-}"
   PR_NUM=$(echo "${GITHUB_REF}" | sed 's:refs/pull/::' | sed 's:/merge::')
   LATEST_TAG="pr-${PR_NUM}"
+elif [[ "${GITHUB_EVENT_NAME}" == "release" ]]; then
+  REFSPEC="${GITHUB_REF}"
+  LATEST_TAG="${REFSPEC}"
 else
   REFSPEC=$(echo "${GITHUB_REF}" | sed 's:refs/heads/::' | sed 's/[^a-zA-Z0-9]/-/')
   LATEST_TAG="${REFSPEC}"