diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 84%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 2380ad460d..9602732586 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Bug report
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!--
 Please add the affected binary name in the title unless multiple binaries are affected, e.g.
 [cinder-csi-plugin] Cannot delete PV
@@ -14,12 +23,7 @@ All the currently maintained binaries are:
 * barbican-kms-plugin
 -->
 
-**Is this a BUG REPORT or FEATURE REQUEST?**:
-
-> Uncomment only one, leave it on its own line: 
->
-> /kind bug
-> /kind feature
+/kind bug
 
 **What happened**:
 
diff --git a/.github/ISSUE_TEMPLATE/feature_report.md b/.github/ISSUE_TEMPLATE/feature_report.md
new file mode 100644
index 0000000000..5470a1036f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_report.md
@@ -0,0 +1,43 @@
+---
+name: Feature report
+about: Feature report
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Please add the affected binary name in the title unless multiple binaries are affected, e.g.
+[cinder-csi-plugin] Cannot delete PV
+For openstack-cloud-controller-manager, you can use [occm] for short.
+
+All the currently maintained binaries are:
+* openstack-cloud-controller-manager (occm)
+* cinder-csi-plugin
+* manila-csi-plugin
+* k8s-keystone-auth
+* client-keystone-auth
+* octavia-ingress-controller
+* magnum-auto-healer
+* barbican-kms-plugin
+-->
+
+/kind feature
+
+**What happened**:
+
+
+**What you expected to happen**:
+
+
+**How to reproduce it**:
+
+
+**Anything else we need to know?**:
+
+
+**Environment**:
+- openstack-cloud-controller-manager(or other related binary) version:
+- OpenStack version:
+- Others:
diff --git a/Makefile b/Makefile
index 5c16a12845..46883ffad8 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ $(BUILD_CMDS): $(SOURCES)
 test: unit functional
 
 check: work
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 run --timeout=20m ./...
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4 run --timeout=20m ./...
 
 unit: work
 	go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)