diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 22b28a0c0d..23958aeb0a 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,44 +1,46 @@
 ---
 name: Bug report
-about: Report a bug in knative/client
+about: Report a bug for "kn"
 title: ''
 labels: kind/bug
 assignees: ''
 
 ---
 <!-- If you need to report a security issue with Knative, send an email to knative-security@googlegroups.com. -->
-## In what area(s)?
 
-<!-- Remove the '> ' to select -->
+### Bug report
 
-<!--
-Classifications:
-> /kind good-first-issue
-> /kind doc
-> /kind cleanup
--->
+<!-- Please describe what is actually happening -->
 
-## What version of Knative Client?
+### Expected behavior
 
-> Paste output of 'kn version'
+<!-- Please describe what you expect to happen -->
 
-## What version of Knative Serving running on your cluster?
+### Steps to reproduce the problem
 
-> 0.5.x
-> 0.6.x
-> 0.7.x
-> 0.8.x
+<!-- How can a maintainer reproduce this issue (please be detailed) -->
 
-## Expected Behavior
+### kn version
 
-<!-- Briefly describe what you expect to happen -->
+<!-- Please paste the output of 'kn version' in the code block below -->
 
+```
 
-## Actual Behavior
+```
 
-<!-- Briefly describe what is actually happening -->
+### Knative (serving/eventing) version
 
+<!-- Remove all except the known affected versions of Knative running on the cluster on which you have detected the issue -->
 
-## Steps to Reproduce the Problem
+> Nightly
+> 0.12.x
+> 0.11.x
+> 0.10.x
+> 0.9.x
 
-<!-- How can a maintainer reproduce this issue (be detailed) -->
+<!--
+Optional classifications: Remove ">" to add corresponding label
+> /kind good-first-issue
+> /kind doc
+> /kind cleanup
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 52f29b2184..8bcff98439 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,24 +1,33 @@
 ---
 name: Feature Request
-about: Create a feature request for knative/client
+about: Request a new feature for "kn"
 title: ''
 labels: kind/feature
 assignees: ''
 
 ---
 <!-- If you need to report a security issue with Knative, send an email to knative-security@googlegroups.com. -->
-## In what area(s)?
 
-<!-- Remove the '> ' to select -->
+### Feature request
+
+<!-- Please describe the feature request and why you would like to have it -->
+
+### Use case
+
+<!-- Please add a concrete use case to demonstrate how suhc a feature would add value for the user. If you don't have a use case for your feature, please remove this section (however providing a good use case increases the likelihood to be picked up) -->
+
+### UI Example
+
+<!-- If this is about a new command or command line options, please let us know how you would add it to the "kn" UI (in the code block below). If this is not applicable for your feature, delete this section. -->
+
+```
+
+```
 
 <!--
-Classifications:
+Optional Classifications, remove the '> ' to select:
 > /kind good-first-issue
-> /kind feature
 > /kind proposal
 > /kind doc
 > /kind cleanup
 -->
-
-## Describe the feature:
-
diff --git a/.github/ISSUE_TEMPLATE/ask-question.md b/.github/ISSUE_TEMPLATE/free-form.md
similarity index 50%
rename from .github/ISSUE_TEMPLATE/ask-question.md
rename to .github/ISSUE_TEMPLATE/free-form.md
index 82ee5426da..4f3d3f2da0 100644
--- a/.github/ISSUE_TEMPLATE/ask-question.md
+++ b/.github/ISSUE_TEMPLATE/free-form.md
@@ -1,23 +1,17 @@
 ---
-name: Question
-about: Ask a question about knative/client
+name: Free Form
+about: Create an unstructured issue.
 title: ''
-labels: kind/question
+labels: ''
 assignees: ''
 
 ---
 <!-- If you need to report a security issue with Knative, send an email to knative-security@googlegroups.com. -->
-## In what area(s)?
-
-<!-- Remove the '> ' to select -->
 
 <!--
-Classifications:
+Optional classifications (remove the '> ' to select)
+> /kind question
 > /kind good-first-issue
 > /kind usage
-> /kind compatibility
 > /kind doc
 -->
-
-## Ask your question here:
-
diff --git a/.github/pull-request-template.md b/.github/pull-request-template.md
index 573f738b11..f45ccff0d9 100644
--- a/.github/pull-request-template.md
+++ b/.github/pull-request-template.md
@@ -1,28 +1,40 @@
-<!--
-Request Prow to automatically lint any go code in this PR:
 
-/lint
--->
+## Desciption
 
-Fixes #
+<!-- Please add a short summary about what the pull request is going to bring on the table -->
 
-## Proposed Changes
+## Changes
+
+<!-- Please add list of more detailed changes. These changes should be reflected also in the commit messages -->
 
 *
 *
 *
 
+## Reference
+
+<!-- Please add the corresponding issue number which this pull request is about to fix -->
+Fixes #
+
 <!--
-Release Note:
+Please add an entrty to CHANGELOG.adoc file, too, as part of your Pull Request.
 
 In the following cases, add a short description of PR to the unreleased section in CHANGELOG.adoc:
 
-- 🎁 Add new feature
-- 🐛 Fix bug
-- 🧽 Update or clean up current behaviour
+- 🎁 New feature
+- 🐛 Bug fix
+- ✨ Feature Update
+- 🐣 Refactoring
 - 🗑️ Remove feature or internal logic
 
-See other entries in CHANGELOG.adoc as an example.
+See other entries in CHANGELOG.adoc as an example for how to add the entry, including a reference to the corresponding issue/PR
 
 PLEASE DON'T ADD THAT LINE HERE IN THE PULL-REQUEST DESCRIPTION BUT DIRECTLY IN CHANGELOG.ADOC AND ADD CHANGELOG.ADOC AS PART OF YOUR PULL-REQUEST.
 -->
+
+<!--
+To automatically lint go code in this pull request uncomment the line belpow. You get feedback as comments on your pull request then -->
+
+<!--
+/lint
+-->
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index d97c1ba276..1d5429731b 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -1,30 +1,28 @@
 # Changelog
 
-// Template:
-////
-[cols="1,10,3", options="header", width="100%"]
-|===
-| | Description | PR
+// Asciidoc template for a single table row. Copy the lines
+// within //// ... //// over into the current, unreleased version
+// table, select the proper icon (see legend at the bottom of this documents)
+// and adapt the link to point to your pull request. Please dont forget
+// the empty line separators.
 
-| 🎁🐛🧽🗑️
+////
+| 🎁🐛✨🐣🗑️
 |
 | https://github.com/knative/client/pull/[#]
-
-|===
 ////
 
-
 ## v0.13.0 (unreleased)
 
 [cols="1,10,3", options="header", width="100%"]
 |===
 | | Description | PR
 
-| 🧽
+| ✨
 | Allow configuration sink prefixes
 | https://github.com/knative/client/pull/571[#571]
 
-| 🧽
+| ✨
 | Support multiple revisions on `kn revision delete`
 | https://github.com/knative/client/pull/657[#657]
 
@@ -44,11 +42,11 @@
 | Add `--cmd` and `--arg` for customization of container entrypoint
 | https://github.com/knative/client/pull/635[#635]
 
-| 🧽
+| ✨
 | Add `no-wait` instead of `--async` and deprecate it
 | https://github.com/knative/client/pull/639[#639]
 
-| 🧽
+| ✨
 | Refactor service `create_test.go` and `update_test.go` to remove unecessary `sync` parameter in setup call
 | https://github.com/knative/client/pull/656[#656]
 
@@ -56,8 +54,8 @@
 | Fix `--image` flag to only allow single occurence
 | https://github.com/knative/client/pull/647[#647]
 
-| 🧽
-| Add `--wait` and `--no-wait` to service delete operation. Change service delete to wait by default.   
+| ✨
+| Add `--wait` and `--no-wait` to service delete operation. Change service delete to wait by default.
 | https://github.com/knative/client/pull/682[#682]
 
 | 🎁
@@ -79,7 +77,7 @@
 | Update to Knative eventing v0.12.0
 | https://github.com/knative/client/pull/621[#621]
 
-| 🧽️
+| ✨️
 | Update to Knative serving v0.12.0
 | https://github.com/knative/client/pull/618[#618]
 
@@ -87,7 +85,7 @@
 | Add `--pull-secret` for specifying pull secrets
 | https://github.com/knative/client/pull/617[#617]
 
-| 🧽
+| ✨
 | Improve error handling when no command is given
 | https://github.com/knative/client/pull/615[#615]
 
@@ -95,7 +93,7 @@
 | Add `--autoscale-window` for service commands
 | https://github.com/knative/client/pull/614[#614]
 
-| 🧽
+| ✨
 | Add checks for namespace creation instead of waiting
 | https://github.com/knative/client/pull/611[#611]
 
@@ -156,15 +154,15 @@
 | Add `kn source apiserver create/delete/update/describe` for managing ApiServer sources
 | https://github.com/knative/client/pull/556[#556]
 
-| 🧽
+| ✨
 | Update to Knative eventing dependency to 0.11.0
 | https://github.com/knative/client/pull/546[#546]
 
-| 🧽
+| ✨
 | Update to Knative serving dependency to 0.11.0
 | https://github.com/knative/client/pull/545[#545]
 
-| 🧽
+| ✨
 | Move cluster URL to `--verbose` for `service describe`
 | https://github.com/knative/client/pull/543[#543]
 
@@ -192,15 +190,15 @@
 | Add CI tests for using Kn with Tekton
 | https://github.com/knative/client/pull/528[#528]
 
-| 🧽
+| ✨
 | Update version information for eventing dependencies
 | https://github.com/knative/client/pull/495[#495]
 
-| 🧽
+| ✨
 | Support multiple NAMEs on kn service delete
 | https://github.com/knative/client/pull/492[#492]
 
-| 🧽
+| ✨
 | Add polling fallback for watching on service readiness
 | https://github.com/knative/client/pull/491[#491]
 
@@ -215,7 +213,7 @@
 |===
 | | Description | PR
 
-| 🧽
+| ✨
 | Update Knative serving dependency to 0.10.0
 | https://github.com/knative/client/pull/474[#474]
 
@@ -242,11 +240,11 @@
 |===
 | | Description | PR
 
-| 🧽
+| ✨
 | Update to Knative serving dependency to 0.9.0
 | https://github.com/knative/client/pull/458[#458]
 
-| 🧽
+| ✨
 | Add revision information to service list
 | https://github.com/knative/client/pull/441[#441]
 
@@ -258,11 +256,11 @@
 | Update build.sh -w to add a message when compilation succeeded
 | https://github.com/knative/client/pull/432[#432]
 
-| 🧽
+| ✨
 | Add more progress information during service create/update
 | https://github.com/knative/client/pull/431[#431]
 
-| 🧽
+| ✨
 | Change plugins configuration name to use `-` (dash) instead of camel case
 | https://github.com/knative/client/pull/428[#428]
 
@@ -270,11 +268,11 @@
 | Add `--annotation` flag for service create and update
 | https://github.com/knative/client/pull/422[#422]
 
-| 🧽
+| ✨
 | Restructure documentation
 | https://github.com/knative/client/pull/421[#421]
 
-| 🧽
+| ✨
 | Refine `route list` output
 | https://github.com/knative/client/pull/407[#407]
 
@@ -290,11 +288,11 @@
 | Retain the request body when logging HTTP
 | https://github.com/knative/client/pull/378[#378]
 
-| 🧽
+| ✨
 | Adds support for building cross platform binaries
 | https://github.com/knative/client/pull/371[#371]
 
-| 🧽
+| ✨
 | Update `version` command shows supported Serving and API versions
 | https://github.com/knative/client/pull/370[#370]
 
@@ -314,7 +312,7 @@
 | Wrap help messages to terminal size
 | https://github.com/knative/client/pull/351[#351]
 
-| 🧽
+| ✨
 | Change bool flags to the paired `--foo` and `--no-foo` format
 | https://github.com/knative/client/pull/346[#346]
 
@@ -354,7 +352,7 @@
 | Report an error if no flag(s) set in service update
 | https://github.com/knative/client/pull/318[#318]
 
-| 🧽
+| ✨
 | Improve create service error message
 | https://github.com/knative/client/pull/312[#312]
 
@@ -417,7 +415,7 @@
 | Dynamically set GroupVersionKind via schema lookup
 | https://github.com/knative/client/pull/134[#134]
 
-| 🧽
+| ✨
 | Introduce a `KnClient` interface
 | https://github.com/knative/client/pull/134[#134]
 
@@ -429,7 +427,7 @@
 | Add `kn route list`
 | https://github.com/knative/client/pull/202[#202]
 
-| 🧽
+| ✨
 | Improved error message when no command is given
 | https://github.com/knative/client/pull/218[#218]
 
@@ -453,7 +451,7 @@
 | Add goimport to `build.sh`
 | https://github.com/knative/client/pull/186[#186]
 
-| 🧽
+| ✨
 | Wait for service to become ready with `kn service create`
 | https://github.com/knative/client/pull/156[#156]
 
@@ -461,19 +459,19 @@
 | Add shell based smoke tests
 | https://github.com/knative/client/pull/183[#183]
 
-| 🧽
+| ✨
 | Use current namespace from `.kube/config` as default
 | https://github.com/knative/client/pull/172[#172]
 
-| 🧽
+| ✨
 | Add `--force` to `kn service create` for replacing existing service
 | https://github.com/knative/client/pull/79[#79]
 
-| 🧽
+| ✨
 | Add `kn revision list --service <srv>`
 | https://github.com/knative/client/pull/194[#194]
 
-| 🧽
+| ✨
 | Add success message to `kn service update`
 | https://github.com/knative/client/pull/169[#169]
 
@@ -485,15 +483,15 @@
 | Add Golang based E2E tests
 | https://github.com/knative/client/pull/121[#121]
 
-| 🧽
+| ✨
 | Rename `kn revision get` to `kn revision list`
 | https://github.com/knative/client/pull/180[#180]
 
-| 🧽
+| ✨
 | Rename `kn service get` to `kn service list`
 | https://github.com/knative/client/pull/179[#179]
 
-| 🧽
+| ✨
 | Refactoring to use sub-packages
 | https://github.com/knative/client/pull/66[#66]
 
@@ -501,7 +499,7 @@
 | Add `--test`, `--fast`, `--update` to `build.sh`
 | https://github.com/knative/client/pull/149[#149]
 
-| 🧽️
+| ✨️
 | Update to Knative serving 0.6.0
 | https://github.com/knative/client/pull/129[#129]
 
@@ -545,7 +543,7 @@
 |===
 
 '''
-_Legend_ :  🎁 Feature - 🐛 Fix - 🧽 Update - 🗑️ Remove
+_Legend_ :  🎁 Feature - 🐛 Fix - ✨ Update - 🐣 Refactoring - 🗑️ Remove
 
 ////
 ---------------------------------------------
@@ -555,3 +553,16 @@ Ignore PRs:
 45
 ---------------------------------------------
 ////
+
+// Asciidoc Template for a new release table. Add this after creating a release
+// to collect new changelog entries
+////
+
+## v0.XX.0 (unreleased)
+
+[cols="1,10,3", options="header", width="100%"]
+|===
+| | Description | PR
+
+|===
+////