diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 2de8c73..464da08 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -16,6 +16,18 @@ body:
       - Do not disclose any sensitive information (including AWS Account IDs)!
       - If you are having issues with the v0 to v1 migration, please open a [v0 to v1 migration issue](https://github.com/alma-cdk/project/issues/new?assignees=maintainers&labels=v1-migration-issue&projects=&template=v1-migration-issue.yml&title=Issue+with+V1+Migration%3A+).
 
+- type: dropdown
+  attributes:
+    label: Operating System
+    description: Which operating system are you using?
+    options:
+      - Linux
+      - macOS
+      - Windows
+      - Other
+  validations:
+    required: true
+
 - type: dropdown
   attributes:
     label: Language
@@ -27,6 +39,14 @@ body:
   validations:
     required: true
 
+- type: input
+  attributes:
+    label: Language Runtime Version
+    description: >
+      Version of the language runtime (e.g., Node.js v18.19.1, Python 3.13.0, Go 1.23.3)
+  validations:
+    required: true
+
 - type: input
   attributes:
     label: Version of aws-cdk-lib