diff --git a/.github/ISSUE_TEMPLATE/2_bug_report.md b/.github/ISSUE_TEMPLATE/1_bug_report.md
similarity index 63%
rename from .github/ISSUE_TEMPLATE/2_bug_report.md
rename to .github/ISSUE_TEMPLATE/1_bug_report.md
index 63ebddf67b4..b78246479e3 100644
--- a/.github/ISSUE_TEMPLATE/2_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.md
@@ -10,14 +10,11 @@ labels: classify, type-bug
 
 -   VS Code version: XXX
 -   Extension version (available under the Extensions sidebar): XXX
--   OS and version: XXX
--   Python version (& distribution if applicable, e.g. Anaconda): XXX
+-   Python Extension version (available under the Extensions sidebar): XXX
+-   OS (Windows | Mac | Linux distro) and version: XXX
+-   Python and/or Anaconda version: XXX
 -   Type of virtual environment used (N/A | venv | virtualenv | conda | ...): XXX
--   Relevant/affected Python packages and their versions: XXX
--   Relevant/affected Python-related VS Code extensions and their versions: XXX
--   Value of the `python.languageServer` setting: XXX
-
-[**NOTE**: If you suspect that your issue is related to the Microsoft Python Language Server (`python.languageServer: 'Microsoft'`), please download our new language server [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) from the VS Code marketplace to see if that fixes your issue]
+-   Jupyter server running: Local | Remote | N/A
 
 ## Expected behaviour
 
diff --git a/.github/ISSUE_TEMPLATE/1_ds_bug_report.md b/.github/ISSUE_TEMPLATE/1_ds_bug_report.md
deleted file mode 100644
index f9f2a490d33..00000000000
--- a/.github/ISSUE_TEMPLATE/1_ds_bug_report.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-name: Bug report for Notebook Editor, Interactive Window, Python Editor cells
-about: Create a report to help us improve
-labels: type-bug, data science
----
-
-# Bug: Notebook Editor, Interactive Window, Editor cells
-
-<!-----------------------------------------------------------------------------------------------
-                                                      ***PLEASE READ***
-If this issue doesn't relate to Jupyter Notebooks, Python Interactive Window features
-or other notebook or "cell"-based features of the Python extension, please use the main Python
-bug template instead of this one. ***Thank you!***
-------------------------------------------------------------------------------------------------->
-
-## Steps to cause the bug to occur
-
-1.
-
-## Actual behavior
-
-## Expected behavior
-
-<!-----------------------------------------------------------------------------------------------
-Animated GIFs can be effective means to describe a bug. Consider using a tool like
-https://github.com/phw/peek or https://www.screentogif.com/ to create one.
-------------------------------------------------------------------------------------------------->
-
-### Your Jupyter and/or Python environment
-
-_Please provide as much info as you readily know_
-
--   **Jupyter server running:** Local | Remote | N/A
--   **Extension version:** 20YY.MM.#####-xxx
--   **VS Code version:** #.##
--   **Setting python.jediEnabled:** true | false
--   **Setting python.languageServer:** Jedi | Microsoft | None
--   **Python and/or Anaconda version:** #.#.#
--   **OS:** Windows | Mac | Linux (distro):
--   **Virtual environment:** conda | venv | virtualenv | N/A | ...
-
-## Python Output
-
-<!-----------------------------------------------------------------------------------------------
-Please set this setting: ```"python.logging.level": "debug"```
-Then restart VS code, reproduce your problem, and copy the output of the 'Python' output tab into this issue.
-------------------------------------------------------------------------------------------------->
-
-Microsoft Data Science for VS Code Engineering Team: @rchiodo, @IanMatthewHuff, @DavidKutu, @DonJayamanne, @greazer, @joyceerhl
diff --git a/.github/ISSUE_TEMPLATE/4_feature_request.md b/.github/ISSUE_TEMPLATE/2_feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/4_feature_request.md
rename to .github/ISSUE_TEMPLATE/2_feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/3_ds_feature_request.md b/.github/ISSUE_TEMPLATE/3_ds_feature_request.md
deleted file mode 100644
index 71876c9f3aa..00000000000
--- a/.github/ISSUE_TEMPLATE/3_ds_feature_request.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Feature request for Notebook Editor, Interactive Window, Editor cells
-about: Suggest an idea for this project
-labels: type-enhancement, data science
----
-
-# Feature: Notebook Editor, Interactive Window, Python Editor cells
-
-<!-----------------------------------------------------------------------------------------------
-                                                      ***PLEASE READ***
-If this issue doesn't relate to Jupyter Notebooks, Python Interactive Window features
-or other "cell"-based features of the Python extension, please use the main Python feature
-request template instead of this one. ***Thank you!***
-------------------------------------------------------------------------------------------------->
-
-## Description
-
-Microsoft Data Science for VS Code Engineering Team: @rchiodo, @IanMatthewHuff, @DavidKutu, @DonJayamanne, @greazer, @joyceerhl
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index ef0e2aae348..67716fd9a02 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Stack Overflow
-    url: https://stackoverflow.com/questions/tagged/visual-studio-code+python
+    url: https://stackoverflow.com/questions/tagged/visual-studio-code+jupyter
     about: Please ask questions here.