diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index cd348ead73..caabab3d99 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!-- All PR should follow this template to allow a clean and transparent review -->
 <!-- Text placed between these delimiters is considered a comment and is not rendered -->
 
-## Change Summary
+## Change summary
 <!--- Provide a general summary of your changes in the Title above -->
 
 ## Types of changes
@@ -24,13 +24,7 @@ the box, please use [x]
 ## Related PR(s)
 <!-- Link here any PRs in other repositories that are required by this PR -->
 
-## Component(s) name
-<!-- A rather incomplete list of components: ethernet, wireguard, bgp, mpls, ldp, l2tp, dhcp ... -->
-
-## Proposed changes
-<!--- Describe your changes in detail -->
-
-## How to test
+## How to test / Smoketest result
 <!---
 Please describe in detail how you tested your changes. Include details of your testing
 environment, and the tests you ran. When pasting configs, logs, shell output, backtraces,
@@ -38,10 +32,9 @@ and other large chunks of text, surround this text with triple backtics
 ```
 like this
 ```
--->
 
-## Smoketest result
-<!-- Provide the output of the smoketest
+Or provide the output of the smoketest
+
 ```
 $ /usr/libexec/vyos/tests/smoke/cli/test_xxx_feature.py
 test_01_simple_options (__main__.TestFeature.test_01_simple_options) ... ok