diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9c906c381608..2545b545b15d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -25,7 +25,8 @@ body:
   - type: textarea
     id: exceptedbhv
     attributes:
-      label: "Excepted behavior"
+      label: "Expected behavior"
+      #Field ID excepted behaviouy should likely be expected bhv (for "Expected behavior")
       description: "A clear and concise description of what you expected to happen."
     validations:
       required: true
@@ -43,3 +44,12 @@ body:
       description: "Is there anything else we should know about this bug report?"
     validations:
       required: false
+      #Added placeholders to guide users
+      - type: textarea
+  id: context
+  attributes:
+    label: "Additional context"
+    description: "Is there anything else we should know about this bug report?"
+    placeholder: "E.g., recent changes in your setup, related logs, etc."
+    labels: ["bug", "triage-needed"] #added more labels
+
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
index d3eff458ea45..f033e309908e 100644
--- a/spotbugs-exclude.xml
+++ b/spotbugs-exclude.xml
@@ -205,4 +205,10 @@
     <Match>
         <Bug pattern="HARD_CODE_KEY" />
     </Match>
+    <!-- Detects hardcoded encryption keys -->
+<Match>
+    <Bug pattern="HARD_CODE_KEY" />
+</Match>
+
 </FindBugsFilter>
+