diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 530d831d8980c..650bf0f4fba73 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -31,8 +31,8 @@ body:
   - type: input
     id: working-version
     attributes:
-      label: Last Known Working CDK Version
-      description: Specify the last known CDK version where this code was functioning as expected (if applicable).
+      label: Last Known Working CDK Library Version
+      description: Specify the last known CDK Library version where this code was functioning as expected (if applicable).
     validations:
       required: false
   - type: textarea
@@ -84,19 +84,20 @@ body:
       required: false
 
   - type: input
-    id: cdk-version
+    id: cdk-lib-version
     attributes:
-      label: CDK CLI Version
-      description: Output of `cdk version`
+      label: AWS CDK Library version (aws-cdk-lib)
+      description: Run `npm ls aws-cdk-lib` at the root of your CDK project
     validations:
       required: true
 
   - type: input
-    id: framework-version
+    id: cdk-cli-version
     attributes:
-      label: Framework Version
+      label: AWS CDK CLI version
+      description: Run `cdk --version` for global installation or `npx cdk --version` at the root of your CDK project
     validations:
-      required: false
+      required: true
 
   - type: input
     id: node-version
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 3747a5aad65aa..7218e2e158059 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -46,9 +46,17 @@ body:
         - label: This feature might incur a breaking change
           required: false
   - type: input
-    id: sdk-version
+    id: cdk-lib-version
     attributes:
-      label: CDK version used
+      label: AWS CDK Library version (aws-cdk-lib)
+      description: Run `npm ls aws-cdk-lib` at the root of your CDK project
+    validations:
+      required: true
+  - type: input
+    id: cdk-cli-version
+    attributes:
+      label: AWS CDK CLI version
+      description: Run `cdk --version` for global installation or `npx cdk --version` at the root of your CDK project
     validations:
       required: true
   - type: input