diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index b5e350b5..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,8 +0,0 @@
-If you are opening an issue regarding an existing notebook/code or the webpage just ignore the instructions below.
-If you want to suggest a notebook for the code gallery please answer these questions:
-
-- \[ \] What is language(s) for used in the example?
-- \[ \] Is it focused on a particular module/software or an IOOS data service?
-- \[ \] Can you provide a minimum example of the expected code and results in a notebook?
-
-Please provide a detailed description of the suggested example below:
diff --git a/.github/ISSUE_TEMPLATE/NEW_NOTEBOOK.yml b/.github/ISSUE_TEMPLATE/NEW_NOTEBOOK.yml
new file mode 100644
index 00000000..5fb5e38a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/NEW_NOTEBOOK.yml
@@ -0,0 +1,38 @@
+---
+name: New Notebook
+description: Request to add a new notebook
+title: "[New Notebook]: "
+labels: ["Notebook idea"]
+assignees:
+  - mathewbiddle
+  - ocefpaf
+body:
+  - type: markdown
+    attributes:
+      value: |
+      If you want to suggest a notebook for the [IOOS CodeLab](https://ioos.github.io/ioos_code_lab/content/intro.html#) please answer these questions:
+  - type: input
+    id: language
+    attributes:
+      label: Programming Language
+      description: What programming language(s) will be used in the example?
+      placeholder: Python
+  - type: input
+    id: tool
+    attributes:
+      label: Module/Software/IOOS data service?
+      description: Is it focused on a particular module/software or an IOOS data service?
+      placeholder: ERDDAP
+  - type: input
+    id: example
+    attributes:
+      label: Module/Software/IOOS data service?
+      description: Can you provide a minimum example of the expected code and results in a notebook?
+      placeholder:
+  - type: input
+    id: description
+    attributes:
+      label: Provide a description.
+      description: Please provide a detailed description of the suggested example below.
+      placeholder:
+---
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md