diff --git a/.github/ISSUE_TEMPLATE/bug-fixes--kalman-filter-travel-time-prediction-algorithm.md b/.github/ISSUE_TEMPLATE/bug-fixes--kalman-filter-travel-time-prediction-algorithm.md
new file mode 100644
index 000000000..7ada14a51
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-fixes--kalman-filter-travel-time-prediction-algorithm.md
@@ -0,0 +1,30 @@
+---
+name: 'Bug Fixes: Kalman Filter Travel Time Prediction Algorithm'
+about: Curative maintenance and bug fixes on the Kalman Filter travel time prediction
+  algorithm
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Expected functionality**
+A clear description of how the functionality is supposed to work
+
+**Describe the bug**
+A clear description of what the bug is.
+
+**To Reproduce**
+Please provide an example where the Kalman Filter travel time prediction algorithm is not behaving as expected. The related datasets showing this example, which may come from several tables within TheTransitClock, should be provided along with a short description. 
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version:**
+Please provide relevant version information.
+
+**Configuration:**
+Please provide relevant configuration information.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dd84ea782..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/curative-maintenance-and-bug-fixes.md b/.github/ISSUE_TEMPLATE/curative-maintenance-and-bug-fixes.md
new file mode 100644
index 000000000..e44045809
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/curative-maintenance-and-bug-fixes.md
@@ -0,0 +1,30 @@
+---
+name: Curative Maintenance and Bug Fixes
+about: Curative maintenance and bug fixes on the Kalman Filter travel time prediction
+  algorithm
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Expected functionality**
+A clear description of how the functionality is supposed to work
+
+**Describe the bug**
+A clear description of what the bug is.
+
+**To Reproduce**
+Please provide an example where Kalman Filter travel time prediction algorithm is not behaving as expected. The related datasets showing this example, which may come from several tables within TheTransitClock, should be provided along with a short description. 
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version:**
+Please provide relevant version information.
+
+**Configuration:**
+Please provide relevant configuration information.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/currative-maintainance-and-bug-fixes.md b/.github/ISSUE_TEMPLATE/currative-maintainance-and-bug-fixes.md
new file mode 100644
index 000000000..ba056c112
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/currative-maintainance-and-bug-fixes.md
@@ -0,0 +1,29 @@
+---
+name: Currative Maintainance and Bug Fixes
+about: Report bugs and make maintainance requests
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Expected functionality**
+A clear description of how the functionality is supposed to work
+
+**Describe the bug**
+A clear description of what the bug is.
+
+**To Reproduce**
+Please provide an example where TheTransitClock is not behaving as expected. The related datasets showing this example, which may come from several tables within TheTransitClock, should be provided along with a short description. 
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version:**
+Please provide relevant version information.
+
+**Configuration:**
+Please provide relevant configuration information.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/kalman-filter-bug-fixes.md b/.github/ISSUE_TEMPLATE/kalman-filter-bug-fixes.md
new file mode 100644
index 000000000..ab8df205e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/kalman-filter-bug-fixes.md
@@ -0,0 +1,30 @@
+---
+name: Kalman Filter Bug Fixes
+about: Curative maintenance and bug fixes on the Kalman Filter travel time prediction
+  algorithm
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Expected functionality**
+A clear description of how the functionality is supposed to work
+
+**Describe the bug**
+A clear description of what the bug is.
+
+**To Reproduce**
+Please provide an example where Kalman Filter travel time prediction algorithm is not behaving as expected. The related datasets showing this example, which may come from several tables within TheTransitClock, should be provided along with a short description. 
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version:**
+Please provide relevant version information.
+
+**Configuration:**
+Please provide relevant configuration information.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/maintainance-issues.md b/.github/ISSUE_TEMPLATE/maintainance-issues.md
new file mode 100644
index 000000000..7f9bbf324
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/maintainance-issues.md
@@ -0,0 +1,30 @@
+---
+name: Maintainance Issues
+about: Curative maintenance and bug fixes on the Kalman Filter travel time prediction
+  algorithm
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Expected functionality**
+A clear description of how the functionality is supposed to work
+
+**Describe the bug**
+A clear description of what the bug is.
+
+**To Reproduce**
+Please provide an example where Kalman Filter travel time prediction algorithm is not behaving as expected. The related datasets showing this example, which may come from several tables within TheTransitClock, should be provided along with a short description. 
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version:**
+Please provide relevant version information.
+
+**Configuration:**
+Please provide relevant configuration information.
+
+**Additional context**
+Add any other context about the problem here.