diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
index d0c841cc9..d6b27e425 100644
--- a/.github/ISSUE_TEMPLATE/Bug.md
+++ b/.github/ISSUE_TEMPLATE/Bug.md
@@ -2,45 +2,53 @@
 name: 🐞 Bug Report
 about: Something is broken in Angular Universal
 ---
-# Bug Report
-
-#### What is the expected behavior?
-
-
-#### What is the current behavior?
 
+# 🐞 Bug report
 
 #### What modules are related to this issue?
-```
+<!-- ✍️edit: -->
 - [ ] aspnetcore-engine
 - [ ] builders
 - [ ] common
 - [ ] express-engine
 - [ ] hapi-engine
 - [ ] module-map-ngfactory-loader
-```
 
+### Is this a regression?
 
-#### Minimal reproduction with instructions:
+<!-- Did this behavior use to work in the previous version? -->
+<!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
 
+### Description
 
-#### What is the use-case or motivation for changing an existing behavior?
+<!-- ✍️--> A clear and concise description of the problem...
 
-
-#### Environment:
-**@nguniversal versions**
-  - aspnetcore-engine: 
-  - common:
-  - express-engine:
-  - hapi-engine:
-  - module-map-ngfactory-loader:
-```
+## 🔬 Minimal Reproduction
 <!--
-Output from: `ng --version`.
-If nothing, output from: `node --version` and `npm --version`.
-  Windows (7/8/10). Linux (incl. distribution). macOS (El Capitan? Sierra?)
+Simple steps to reproduce this bug.
+
+Please include: commands run (including args), packages added, related code changes.
+
+If reproduction steps are not enough for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue. 
+A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem. 
+Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
+
+Issues that don't have enough info and can't be reproduced will be closed.
+
+You can read more about issue submission guidelines here: https://github.com/angular/universal/blob/master/CONTRIBUTING.md#-submitting-an-issue
 -->
-```
 
+## 🔥 Exception or Error
+<pre><code>
+<!-- If the issue is accompanied by an exception or an error, please share it below: -->
+<!-- ✍️-->
+
+</code></pre>
+
+
+## 🌍 Your Environment
+<pre><code>
+<!-- run `ng version` and paste output below -->
+<!-- ✍️-->
 
-#### Is there anything else we should know?
+</code></pre>
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md
index e9c7d7883..3581ea4d4 100644
--- a/.github/ISSUE_TEMPLATE/Feature_Request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_Request.md
@@ -1,13 +1,28 @@
 ---
-name: 🎉 Feature Request
+name: 🚀 Feature Request
 about: You have an idea that you'd like to be implemented in Angular Universal
 ---
-# Feature Request
 
-#### What is the desired behavior?
 
+# 🚀 Feature request
 
-#### What is the use-case or motivation for the desired behavior?
 
+#### What modules are relevant for this feature request?
+<!-- ✍️edit: -->
+- [ ] aspnetcore-engine
+- [ ] builders
+- [ ] common
+- [ ] express-engine
+- [ ] hapi-engine
+- [ ] module-map-ngfactory-loader
 
-#### Is there anything else we should know?
\ No newline at end of file
+### Description
+<!-- ✍️--> A clear and concise description of the problem or missing capability...
+
+
+### Describe the solution you'd like
+<!-- ✍️--> If you have a solution in mind, please describe it.
+
+
+### Describe alternatives you've considered
+<!-- ✍️--> Have you considered any alternative solutions or workarounds?