diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
index 41ca77e3..4f7c2b9e 100644
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@@ -12,17 +12,63 @@ labelPRBasedOnFilePath:
   area/provider/azure:
     - diagrams/azure/*
     - resources/azure/**/*
+  
+  area/provider/digitalocean:
+    - diagrams/digitalocean/*
+    - resources/digitalocean/**/*
+
+  area/provider/elastic:
+    - diagrams/elastic/*
+    - resources/elastic/**/*
  
   area/provider/firebase:
     - diagrams/firebase/*
     - resources/firebase/**/*
+
+  area/provider/gcp:
+    - diagrams/gcp/*
+    - resources/gcp/**/*
+
+  area/provider/generic:
+    - diagrams/generic/*
+    - resources/generic/**/*
+
+  area/provider/ibm:
+    - diagrams/ibm/*
+    - resources/ibm/**/*    
+
+  area/provider/k8s:
+    - diagrams/k8s/*
+    - resources/k8s/**/*
     
-  # @TODO: extend with other labels
+  area/provider/oci:
+    - diagrams/oci/*
+    - resources/oci/**/*
+
+  area/provider/onprem:
+    - diagrams/onprem/*
+    - resources/onprem/**/*
+
+  area/provider/openstack:
+    - diagrams/openstack/*
+    - resources/openstack/**/*
+
+  area/provider/outscale:
+    - diagrams/outscale/*
+    - resources/outscale/**/*
+
+  area/provider/programming:
+    - diagrams/programming/*
+    - resources/programming/**/*
+
+  area/provider/saas:
+    - diagrams/saas/*
+    - resources/saas/**/*
 
 firstPRWelcomeComment: >
   Congratulations on your first Pull Request!
   If you have any issues or are unsure about any anything please check our
-  Contribution Guide (https://github.com/mingrammer/diagrams/blob/master/CONTRIBUTING.rst)
+  Contribution Guide (https://github.com/mingrammer/diagrams/blob/master/CONTRIBUTING.md)
 
 firstPRMergeComment: >
   Awesome work, congrats on your first merged pull request!