diff --git a/.github/ISSUE_TEMPLATE/blank.md b/.github/ISSUE_TEMPLATE/blank.md
new file mode 100644
index 0000000..2c1cd77
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank.md
@@ -0,0 +1,5 @@
+---
+name: Issue
+about: Report an issue with the website
+title: Website issue (blank)
+---
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 0000000..ce49e9d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Report a bug with the website
+title: Website bug report
+labels: bug
+---
+
+# You are creating a bug report for the https://grpc.io website. If you mean to create an issue for gRPC software, visit the [appropriate repository](https://grpc.io/community) instead.
+
+**Issue description**
+A clear and concise description of the issue.
+
+**Steps to reproduce the issue**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expect rather than what you observe.
+
+**Screenshots**
+If applicable, add screenshots to help illustrate the issue.
+
+**Desktop (if relevant):**
+ - OS:
+ - Browser
+
+**Mobile (if relevant):**
+ - Device:
+ - OS:
+ - Browser
+
+**Additional info**
+Add any other context or information about the issue.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 83cc838..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: Website bug report
-labels: bug
-assignees: ''
-
----
-
-# You are creating a bug report for the https://grpc.io/ website. If you meant to create an issue for the gRPC software, please visit the [appropriate repository](https://grpc.io/community/) instead.
-
-**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/general.md b/.github/ISSUE_TEMPLATE/general.md
new file mode 100644
index 0000000..b0afddd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general.md
@@ -0,0 +1,34 @@
+---
+name: General issue
+about: Report a general issue with the website
+title: Website issue
+---
+
+# You are creating an issue for the https://grpc.io website. If you mean to create an issue for gRPC software, visit the [appropriate repository](https://grpc.io/community) instead.
+
+**Issue description**
+A clear and concise description of the issue.
+
+**Steps to reproduce the issue**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expect rather than what you observe.
+
+**Screenshots**
+If applicable, add screenshots to help illustrate the issue.
+
+**Desktop (if relevant):**
+ - OS:
+ - Browser
+
+**Mobile (if relevant):**
+ - Device:
+ - OS:
+ - Browser
+
+**Additional info**
+Add any other context or information about the issue.