diff --git a/.github/ISSUE_TEMPLATE/2_bug.md b/.github/ISSUE_TEMPLATE/2_bug.md
index 275decdfdf..15dce89005 100644
--- a/.github/ISSUE_TEMPLATE/2_bug.md
+++ b/.github/ISSUE_TEMPLATE/2_bug.md
@@ -23,16 +23,37 @@ assignees: ''
 
 ## Steps to Reproduce
 
-<!-- You must include full steps to reproduce so that we can reproduce the problem. -->
+<!-- Please include full steps to reproduce so that we can reproduce the problem. -->
 
-1. Run `flutter create bug`.
-2. Update the files as follows: ... <!-- include every file that is different from the template app! -->
-3. ... <!-- describe how to reproduce the problem -->
+1. Execute `flutter run` on the code sample <!-- (see "Code sample" section below) -->
+2. ... <!-- describe steps to demonstrate bug -->
+3. ... <!-- for example "Tap on X and see a crash" -->
 
 **Expected results:** <!-- what did you want to see? -->
 
 **Actual results:** <!-- what did you see? -->
 
+<details>
+<summary>Code sample</summary>
+
+<!--
+      Please create a minimal reproducible sample that shows the problem
+      and attach it below between the lines with the backticks.
+
+      To create it you can use `flutter create bug` command and update the `main.dart` file.
+
+      Alternatively, you can use https://dartpad.dev/
+      which is capable of creating and running small Flutter apps.
+
+      Without this we will unlikely be able to progress on the issue, and because of that
+      we regretfully will have to close it.
+-->
+
+```dart
+```
+
+</details>
+
 <details>
   <summary>Logs</summary>
 
@@ -60,3 +81,12 @@ assignees: ''
 ```
 
 </details>
+
+
+<!--
+      Consider also attaching screenshots and/or videos to better
+      illustrate the issue.
+
+      You can upload them directly on GitHub.
+      Beware that video file size is limited to 10MB.
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/3_feature_request.md b/.github/ISSUE_TEMPLATE/3_feature_request.md
index 0e851e47c1..98fac481c3 100644
--- a/.github/ISSUE_TEMPLATE/3_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/3_feature_request.md
@@ -38,7 +38,10 @@ assignees: ''
 <!--
      Briefly but precisely describe what you would like Flutter to be able to do.
 
-     Consider attaching images showing what you are imagining.
+     Consider attaching something showing what you are imagining:
+      * images
+      * videos
+      * code samples
 
      Does this have to be provided by Flutter directly, or can it be provided
      by a package on pub.dev/flutter? If so, maybe consider implementing and