diff --git a/contributing/bug_policy.rst b/contributing/bug_policy.rst
index a81f2c0ae171c76201740f1f3fde04f33915e4c7..5013cae7b1319dc0b7368856731576bba7fcccc4 100644
--- a/contributing/bug_policy.rst
+++ b/contributing/bug_policy.rst
@@ -23,11 +23,12 @@ in our bug tracker and in the project that you think is the source of the
 issue. Use the provided template:
 
 * The module affected
-* What is the action and the result you see? (the bug)
-* What is the action and the result you expect? (the correct behaviour)
-* Frequency: always, sometimes, one-time issue
+* What is the action to reproduce the bug? (Steps to reproduce)
+* What is the result you see? (Actual result)
+* What is the result you expect? (Expected behaviour)
+* Frequency? (always, sometimes, one-time issue)
 * Tested version (image name and version, platform)
-* Do you know any workaround of this issue?
+* Do you know any workaround of this issue? (link to workaround/mitigation steps etc)
 * Do you have a fix for this issue?
 
 Developers review the reported issues and perform triage (see below). When a fix