diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index af0845e6..e1217079 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -126,6 +126,14 @@ body:
     validations:
       required: true
 
+  - type: input
+    id: battery_count
+    attributes:
+      label: Battery count
+      description: Specify how many batteries/BMS are connected to your Venus OS.
+    validations:
+      required: true
+
   - type: dropdown
     id: connection_type
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/support_request.yml b/.github/ISSUE_TEMPLATE/support_request.yml
index 0f94f903..c62a296a 100644
--- a/.github/ISSUE_TEMPLATE/support_request.yml
+++ b/.github/ISSUE_TEMPLATE/support_request.yml
@@ -102,6 +102,14 @@ body:
     validations:
       required: true
 
+  - type: input
+    id: battery_count
+    attributes:
+      label: Battery count
+      description: Specify how many batteries/BMS are connected to your Venus OS.
+    validations:
+      required: true
+
   - type: dropdown
     id: connection_type
     attributes:
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
index a98b5425..2bf7c99e 100644
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@@ -57,6 +57,9 @@ jobs:
           cache: yarn
           cache-dependency-path: './docs/yarn.lock' # THIS PATTERN did the trick for me.
 
+      - name: Cleanup
+        run: yarn clear
+
       - name: Install dependencies
         run: yarn install --cwd ./docs --frozen-lockfile --non-interactive