diff --git a/.github/ISSUE_TEMPLATE/general-support.md b/.github/ISSUE_TEMPLATE/general-support.md
new file mode 100644
index 000000000..f7d517dbb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general-support.md
@@ -0,0 +1,8 @@
+---
+name: General Issue
+about: Open a general issue in the kubernetes/community repo
+title: ''
+labels: ''
+assignees: ''
+
+---
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
new file mode 100644
index 000000000..173f5f183
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -0,0 +1,18 @@
+---
+name: Support Request
+about: Support request or question relating to Kubernetes
+labels: triage/support
+
+---
+
+<!-- 
+STOP -- PLEASE READ!
+
+GitHub is not the right place for support requests.
+
+If you're looking for help, check [Stack Overflow](https://stackoverflow.com/questions/tagged/kubernetes) and the [troubleshooting guide](https://kubernetes.io/docs/tasks/debug-application-cluster/troubleshooting/).
+
+You can also post your question on the [Kubernetes Slack](http://slack.k8s.io/) or the [Discuss Kubernetes](https://discuss.kubernetes.io/) forum.
+
+If the matter is security related, please disclose it privately via https://kubernetes.io/security/.
+-->
diff --git a/.github/OWNERS b/.github/OWNERS
new file mode 100644
index 000000000..6355d91c9
--- /dev/null
+++ b/.github/OWNERS
@@ -0,0 +1,4 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+labels:
+  - sig/contributor-experience
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE
rename to .github/PULL_REQUEST_TEMPLATE.md