diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc1e800e05c..5ac28377803 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,20 +38,25 @@ jobs:
       - name: Setup environment variables
         run: |
           echo "NODE_VERSION=$(jq -r -j '.engines.node|ltrimstr("^")' package.json)" >> $GITHUB_ENV
+          IS_RELEASE=${{ startsWith(github.event.head_commit.message, 'chore(release): release') }}
+          IS_MANUAL_BUILD=${{ startsWith(github.event.head_commit.message, 'dockerize') }}
+          echo IS_RELEASE=$IS_RELEASE
+          echo IS_MANUAL_BUILD=$IS_MANUAL_BUILD
 
-          if [ ${{github.ref_type}} = "tag" ]; then
+          if [ $IS_RELEASE = true ]; then
+            echo IS_RELEASE_TRUE
             DOCKER_REPOSITORY_FOR_REF=${{ secrets.GCP_AR_PARABOL }}
           else
             DOCKER_REPOSITORY_FOR_REF=${{ secrets.GCP_AR_PARABOL_DEV }}
           fi
+          echo DOCKER_REPOSITORY_FOR_REF=$DOCKER_REPOSITORY_FOR_REF
 
           echo "DOCKER_REPOSITORY_FOR_REF=${DOCKER_REPOSITORY_FOR_REF}" >> $GITHUB_ENV
 
-          GITHUB_REF_NAME_NORMALIZED=$(echo ${{github.ref_name}} | tr / -)
-          echo "GITHUB_REF_NAME_NORMALIZED=${GITHUB_REF_NAME_NORMALIZED}" >> $GITHUB_ENV
-
-          DOCKERIZE=${{ github.ref_type == 'tag' || contains(fromJSON('["master", "release", "staging", "production"]'), github.ref_name) || startsWith(github.event.head_commit.message, 'dockerize')}}
+          DOCKERIZE=$IS_RELEASE || $IS_MANUAL_BUILD
+          echo DOCKERIZE=$DOCKERIZE
           echo "DOCKERIZE=${DOCKERIZE}" >> $GITHUB_ENV
+          echo "IS_RELEASE=${IS_RELEASE}" >> $GITHUB_ENV
 
           ACTION_VERSION=$(grep '"version":' package.json | cut -d\" -f4)
           echo "ACTION_VERSION=${ACTION_VERSION}" >> $GITHUB_ENV
@@ -188,9 +193,9 @@ jobs:
           push: true
           tags: |
             "${{ secrets.GCP_AR_PARABOL_DEV }}:${{github.sha}}"
-            "${{ env.DOCKER_REPOSITORY_FOR_REF }}:${{ env.GITHUB_REF_NAME_NORMALIZED }}"
+            "${{ env.DOCKER_REPOSITORY_FOR_REF }}:v${{ env.ACTION_VERSION }}"
       - name: Push Artifacts to Sentry
-        if: github.ref_type == 'tag'
+        if: env.IS_RELEASE == 'true'
         uses: getsentry/action-release@v1
         env:
           SENTRY_AUTH_TOKEN: "${{secrets.SENTRY_AUTH_TOKEN}}"
@@ -201,7 +206,7 @@ jobs:
           sourcemaps: "./build"
           version: ${{env.ACTION_VERSION}}
       - name: Push Artifacts to Datadog
-        if: github.ref_type == 'tag'
+        if: env.IS_RELEASE == 'true'
         env:
           DATADOG_API_KEY: "${{secrets.DATADOG_API_KEY}}"
           CDN_BUILD_URL: "https://action-files.parabol.co/production/build/"
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 4ef540732ee..8860c5cb710 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -11,3 +11,4 @@ jobs:
         with:
           command: manifest
           default-branch: release
+          release-type: node