diff --git a/.github/ISSUE_TEMPLATE/blank_issue.md b/.github/ISSUE_TEMPLATE/blank_issue.md
new file mode 100644
index 00000000..57febe7d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank_issue.md
@@ -0,0 +1,5 @@
+---
+name: Blank Issue
+about: Create a blank issue.
+title: ''
+---
diff --git a/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
new file mode 100644
index 00000000..ffdf0906
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/improvement.md
@@ -0,0 +1,28 @@
+---
+name: Improvement
+about: A feature request or code improvement.
+title: ''
+labels: ''
+assignees: ''
+---
+
+Thanks for filing a feature request! Please fill out the TODOs below.
+
+#### Feature
+
+TODO: Brief description of the feature/improvement you'd like to see in WAMR
+
+#### Benefit
+
+TODO: What is the value of adding this in WAMR? What problems does it solve?
+
+#### Implementation
+
+TODO: Do you have an implementation plan, and/or ideas for data structures or
+algorithms to use?
+
+#### Alternatives
+
+TODO: What are the alternative implementation approaches or alternative ways to
+solve the problem that this feature would solve? How do these alternatives
+compare to this proposal?
diff --git a/.github/ISSUE_TEMPLATE/report_bug.md b/.github/ISSUE_TEMPLATE/report_bug.md
new file mode 100644
index 00000000..d3058c9c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report_bug.md
@@ -0,0 +1,36 @@
+---
+name: WAMR bug or defect report
+about: Report a bug or defect in WAMR
+title: ''
+---
+
+Thanks for filing a bug or defect report! Please fill out the TODOs below.
+
+### Subject of the issue
+
+Describe the bug or defect here.
+
+### Test case
+
+Upload the related wasm file, wast file or the source files if you can.
+
+### Your environment
+
+* Host OS
+* WAMR version, platform, cpu architecture, running mode, etc.
+
+### Steps to reproduce
+
+Tell us how to reproduce this bug or defect.
+
+### Expected behavior
+
+Tell us what should happen
+
+### Actual behavior
+
+Tell us what happens instead
+
+### Extra Info
+
+Anything else you'd like to add?
diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
index b249f7b0..2c83d667 100644
--- a/ATTRIBUTIONS.md
+++ b/ATTRIBUTIONS.md
@@ -60,11 +60,11 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 
 ### llvm
 
-[LICENSE](./core/deps/llvm/llvm/LICENCE.txt)
+[LICENSE](./LICENCE.txt)
 
 ### wasm-c-api
 
-[LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/wasm-c-api/src/LICENSE)
+[LICENSE](./samples/wasm-c-api/src/LICENSE)
 
 ### wasmtime
 
@@ -78,10 +78,6 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 
 [LICENSE](https://github.com/bytecodealliance/wamr-app-framework/blob/main/samples/gui/wasm-runtime-wgl/src/platform/zephyr/LICENSE)
 
-### wac
-
-[LICENSE](./tests/wamr-test-suites/spec-test-script/LICENSE)
-
 ### libuv
 
 [LICENSE](./core/iwasm/libraries/libc-uvwasi/LICENSE_LIBUV)