diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3e4857dd..be415e99 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,14 +4,17 @@ What kind of issue is this?
       something, or to understand why something isn't working the way you expect it to, use
       our Community Forums https://community.platformio.org
 
+- [ ] PlatformIO IDE. All issues related to PlatformIO IDE should be reported to appropriate repository
+      https://github.com/platformio/platformio-atom-ide/issues
+
+- [ ] Development Platforms. All issues related to Development Platforms should be reported to appropriate repository
+      https://github.com/platformio?query=platform-
+
 - [ ] Feature Request. Start by telling us what problem you’re trying to solve. Often a solution
       already exists! Don’t send pull requests to implement new features without first getting our
       support. Sometimes we leave features out on purpose to keep the project small.
 
-- [ ] PlatformIO IDE. All issues related to PlatformIO IDE should be reported to appropriate repository
-      https://github.com/platformio/platformio-atom-ide/issues
-
-- [ ] Bug report. If you’ve found a bug, please provide information below.
+- [ ] PlatformIO Core. If you’ve found a bug, please provide information below.
 
 *You can erase any parts of this template not applicable to your Issue.*