diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..73ec498014a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,7 @@
+## The problem
+<!-- 
+    Describe the issue you are experiencing here to communicate to the
+    maintainers. Tell us what you were trying to do and what happened instead.
+-->
+
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 4270779b426..7db182f60dd 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,14 +1,14 @@
 blank_issues_enabled: false
 contact_links:
-    - name: Report a bug/issue with Home Assistant itself
-      url: https://github.com/home-assistant/home-assistant/issues
-      about: This is the issue tracker for our website. Please report issues with Home Assistant in the main repository.
-    - name: I have a question or need support
-      url: https://www.home-assistant.io/help
-      about: We use GitHub for tracking bugs, check our website for resources on getting help.
-    - name: Feature Request
-      url: https://community.home-assistant.io/c/feature-requests
-      about: Please use our Community Forum for doing feature requests.
-    - name: I'm unsure where to go
-      url: https://www.home-assistant.io/join-chat
-      about: If you are unsure where to go, then joining our chat is recommended; Just ask!
+  - name: Report a bug/issue with Home Assistant Core itself
+    url: https://github.com/home-assistant/core/issues
+    about: This is the issue tracker for our website. Please report issues with Home Assistant Core in the main repository.
+  - name: I have a question or need support
+    url: https://www.home-assistant.io/help
+    about: We use GitHub for tracking bugs, check our website for resources on getting help.
+  - name: Feature Request
+    url: https://community.home-assistant.io/c/feature-requests
+    about: Please use our Community Forum for doing feature requests.
+  - name: I'm unsure where to go
+    url: https://www.home-assistant.io/join-chat
+    about: If you are unsure where to go, then joining our chat is recommended; Just ask!
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index cbec4dd560d..d0dac4f97ff 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,6 +18,7 @@
 - [ ] Spelling, grammar or other readability improvements (`current` branch).
 - [ ] Adjusted missing or incorrect information in the current documentation (`current` branch).
 - [ ] Added documentation for a new integration I'm adding to Home Assistant (`next` branch).
+  - [ ] I've opened up a PR to add logo's and icons in [Brands repository](https://github.com/home-assistant/brands).
 - [ ] Added documentation for a new feature I'm adding to Home Assistant (`next` branch).
 - [ ] Removed stale or deprecated documentation.
 
@@ -27,8 +28,9 @@
     Please be sure to fill out additional details, if applicable.
 -->
 
-- Link to parent pull request in the codebase:
-- This PR fixes or closes issue:
+- Link to parent pull request in the codebase: 
+- Link to parent pull request in the Brands repository: 
+- This PR fixes or closes issue: 
 
 ## Checklist
 <!--