diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index be64a7372..d750dd44c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -54,8 +54,16 @@ body:
   - type: input
     id: version
     attributes:
-      label: Docker Selenium version (tag or chart version)
+      label: Docker Selenium version (image tag)
       description: What version of Docker Selenium are you using?
       placeholder: 4.16.1-20231212? Please use the full tag, avoid "latest"
     validations:
       required: true
+  - type: input
+    id: chart-version
+    attributes:
+      label: Selenium Grid chart version (chart version)
+      description: What version of Selenium Grid chart are you using?
+      placeholder: 0.26.2?
+    validations:
+      required: false
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index de0ac5db9..21d0b60a7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -80,7 +80,7 @@ jobs:
           git config --local user.name "Selenium CI Bot"
           git commit -m "Update tag in docs and files" -a
       - name: Push changes
-        uses: ad-m/github-push-action@d91a481090679876dfc4178fef17f286781251df # master
+        uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
           branch: trunk
diff --git a/.github/workflows/update-chart-changelog.yaml b/.github/workflows/update-chart-changelog.yaml
index 9a57e0b4f..3ac45a214 100644
--- a/.github/workflows/update-chart-changelog.yaml
+++ b/.github/workflows/update-chart-changelog.yaml
@@ -1,13 +1,15 @@
 name: Update Chart CHANGELOG
 
 on:
-  page_build:
+  release:
+    types: [published]
   workflow_dispatch:
 
 jobs:
   release:
     runs-on: ubuntu-latest
     permissions: write-all
+    if: ${{ contains(github.event.release.tag_name, 'selenium-grid') || github.event_name == 'workflow_dispatch' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,7 +27,7 @@ jobs:
           git commit -m "Update chart CHANGELOG [skip ci]" -a
 
       - name: Push changes
-        uses: ad-m/github-push-action@d91a481090679876dfc4178fef17f286781251df # master
+        uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
           branch: trunk
diff --git a/update_tag_in_docs_and_files.sh b/update_tag_in_docs_and_files.sh
index 135b06b1a..11da34f95 100755
--- a/update_tag_in_docs_and_files.sh
+++ b/update_tag_in_docs_and_files.sh
@@ -42,6 +42,7 @@ if [ "$latest_chart_app_version" == $LATEST_TAG ] && [ "$latest_chart_app_versio
   echo -e "\033[0;32m NEXT_CHART_VERSION -> ${next_chart_version}\033[0m"
   # If you want to test this locally and you are using macOS, do `brew install gnu-sed` and change `sed` for `gsed`.
   find . \( -type d -name .git -prune \) -o -type f -name 'Chart.yaml' -print0 | xargs -0 sed -i "s/${latest_chart_version}/${next_chart_version}/g"
+  find . \( -type d -name .git -prune \) -o -type f -name 'bug_report.yaml' -print0 | xargs -0 sed -i "s/${latest_chart_version}/${next_chart_version}/g"
 fi
 
 git diff | cat