diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 37cd6022..dad5f890 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,12 +1,3 @@
 ## Description
 
-**What(what issue does this code solve/what feature does it add):**
-
-**How(how does it solve it):**
-
-## Required Checklist:
-
-- [ ] I have added any necessary documentation  and comments in my code (where appropriate)
-- [ ] I have added tests to make sure my code runs in all contexts
-
-## Further comments
\ No newline at end of file
+**What issue are you solving (or what feature are you adding) and how are you doing it?**
\ No newline at end of file
diff --git a/.github/workflows/autolabeller.yml b/.github/workflows/autolabeller.yml
index 4fb3dddd..57091e8c 100644
--- a/.github/workflows/autolabeller.yml
+++ b/.github/workflows/autolabeller.yml
@@ -26,22 +26,21 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GIT_MASTER_TOKEN }}
         with:
-            #TODO: fix all emojis
           types: |-
+            build
+            chore
+            ci
+            deprecate
+            docs
             feat
             fix
-            chore
-            docs
-            test
-            security
+            perf
+            refactor
             remove
             revert
-            perf
+            security
             style
-            deprecate
-            refactor
-            ci
-            build
+            test
           requireScope: false
           # Ensures the subject start with an uppercase character.
           subjectPattern: ^([A-Z]).+$