diff --git a/config/retired_files.yaml b/config/retired_files.yaml
index 9d38ea13..cc345038 100644
--- a/config/retired_files.yaml
+++ b/config/retired_files.yaml
@@ -3,5 +3,6 @@
 # This is uncommented as I had issues with everything being deleted when this was just present as an empty key.
 # May be something to investigate.
 retired_files:
+  - .github/ISSUE_TEMPLATE/bug_report.yml
   - .readme/static/sdp_overview.png
   - bors.toml
diff --git a/template/.github/ISSUE_TEMPLATE/02-bug_report.yml.j2 b/template/.github/ISSUE_TEMPLATE/02-bug_report.yml.j2
index 661bac37..6b999c01 100644
--- a/template/.github/ISSUE_TEMPLATE/02-bug_report.yml.j2
+++ b/template/.github/ISSUE_TEMPLATE/02-bug_report.yml.j2
@@ -12,13 +12,12 @@ body:
       label: Affected Stackable version
       description: Which version of the Stackable Operator do you see this bug in?
 
-# {[% if operator.has_product | default(true) %}]
-
+  # {[%- if operator.has_product | default(true) +%}]
   - type: input
     attributes:
       label: Affected {[ operator.pretty_string }] version
       description: Which version of {[ operator.pretty_string }] do you see this bug in?
-# {[% endif %}]
+  # {[%- endif +%}]
 
   - type: textarea
     attributes:
@@ -41,7 +40,7 @@ body:
     attributes:
       label: Environment
       description: |
-        What type of kubernetes cluster you are running aginst (k3s/eks/aks/gke/other) and any other information about your environment?
+        What type of kubernetes cluster you are running against (k3s/eks/aks/gke/other) and any other information about your environment?
       placeholder: |
         Examples:
         Output of `kubectl version --short`