diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8486f01..317b1d7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -5,7 +5,7 @@ about: Suggest an idea for this project
 ---
 
 (check apply)
-- [ ] read [the contribution guideline](https://github.com/uken/fluent-plugin-elasticsearch/blob/master/CONTRIBUTING.md)
+- [ ] read [the contribution guideline](https://github.com/fluent/fluent-plugin-opensearch/blob/master/CONTRIBUTING.md)
 
 **Is your feature request related to a problem? Please describe.**
 
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index b66b74e..0000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-(check apply)
-- [ ] read [the contribution guideline](https://github.com/fluent/fluent-plugin-opensearch/blob/master/CONTRIBUTING.md)
-
-#### Problem
-
-...
-
-#### Steps to replicate
-
-Provide example config and message
-
-#### Expected Behavior or What you need to ask
-
-...
-
-#### Using Fluentd and OpenSearch plugin versions
-
-* OS version
-* Bare Metal or within Docker or Kubernetes or others?
-* Fluentd v1.0 or later
-  * paste result of ``fluentd --version`` or ``td-agent --version``
-* OpenSearch plugin version
-  * paste boot log of fluentd or td-agent
-  * paste result of ``fluent-gem list``, ``td-agent-gem list`` or your Gemfile.lock
-* OpenSearch version (optional)
-* OpenSearch template(s) (optional)