diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index ef2a3d6..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Hi,
-
-Before creating an issue, please check out the Contributing Guide:
-
-https://github.com/ankane/searchkick/blob/master/CONTRIBUTING.md
-
-Thanks!
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..c61979a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,53 @@
+---
+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**
+
+Use this code to reproduce:
+
+```ruby
+require "bundler/inline"
+
+gemfile do
+  source "https://rubygems.org"
+
+  gem "activerecord", require: "active_record"
+  gem "activejob", require: "active_job"
+  gem "sqlite3"
+  gem "searchkick", git: "https://github.com/ankane/searchkick.git"
+end
+
+puts "Searchkick version: #{Searchkick::VERSION}"
+puts "Elasticsearch version: #{Searchkick.server_version}"
+
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+ActiveJob::Base.queue_adapter = :inline
+
+ActiveRecord::Migration.create_table :products do |t|
+  t.string :name
+end
+
+class Product < ActiveRecord::Base
+  searchkick
+end
+
+Product.reindex
+Product.create!(name: "Test")
+Product.search_index.refresh
+p Product.search("test", fields: [:name]).response
+```
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..666a4df
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Help
+    url: https://stackoverflow.com/questions/tagged/searchkick
+    about: Ask and answer questions here
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--
libgit2 0.21.0