diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index efcac778d..3d5769140 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -36,7 +36,7 @@ jobs:
         with:
           images: ${{ github.repository }}
           tag-custom: 5.x-next
-          tag-custom-only: ${{ github.ref == 'refs/heads/master' }}
+          tag-custom-only: ${{ github.ref == 'refs/heads/5.x' }}
           tag-semver: |
             {{version}}
             {{major}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f520fe1c6..2e0a4877f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,6 @@ on:
   push:
     tags:
       - '*'
-
 jobs:
   release:
     name: Release
@@ -23,6 +22,7 @@ jobs:
       run: yarn lint
     - name: Publish
       run: sh scripts/publish.sh
+      if: ${{ github.ref == 'refs/heads/5.x' }}
       env:
         REGISTRY_AUTH_TOKEN: ${{ secrets.REGISTRY_AUTH_TOKEN }}
         REGISTRY_URL: registry.npmjs.org