diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 606789e..0460a22 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# Basic dependabot.yml to update gomod
+# Basic dependabot.yml to update gomod and Github Actions
 
 version: 2
 updates:
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4839d45..49f575a 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -38,10 +38,13 @@ pull_request_rules:
   - name: Automatic Merge ⬇️ on Approval ✔
     conditions:
       - "#approved-reviews-by>=1"
+      - "#review-requested=0"
+      - "#changes-requested-reviews-by=0"
       - check-success='test (1.15.x, ubuntu-latest)'
       - check-success='test (1.16.x, ubuntu-latest)'
       - check-success='test (1.17.x, ubuntu-latest)'
       - check-success='Analyze (go)'
+      - -title~=(?i)wip
       - label!=work-in-progress
       - -draft
     actions:
@@ -98,12 +101,20 @@ pull_request_rules:
   # - chore:     updating grunt tasks etc.; no production code change
   # - docs:      changes to the documentation
   # - feat:      feature or story
-  # - feat:      new feature for the user, not a new feature for build script
+  # - feature:   new feature or story
   # - fix:       bug fix for the user, not a fix to a build script
   # - idea:      general idea or suggestion
+  # - question:  question regarding code
   # - test:      test related changes
+  # - wip:       work in progress PR
   # ===============================================================================
 
+  - name: Work in Progress
+    conditions:
+      - "head~=(?i)^wip" # if the PR branch starts with wip/
+    actions:
+      label:
+        add: ["work-in-progress"]
   - name: Hotfix label
     conditions:
       - "head~=(?i)^hotfix" # if the PR branch starts with hotfix/
@@ -115,13 +126,13 @@ pull_request_rules:
       - "head~=(?i)^(bug)?fix" # if the PR branch starts with (bug)?fix/
     actions:
       label:
-        add: [ "bug-P3" ]
+        add: ["bug-P3"]
   - name: Documentation label
     conditions:
       - "head~=(?i)^docs" # if the PR branch starts with docs/
     actions:
       label:
-        add: [ "documentation" ]
+        add: ["documentation"]
   - name: Feature label
     conditions:
       - "head~=(?i)^feat(ure)?" # if the PR branch starts with feat(ure)?/