diff --git a/.gibot.yml b/.gibot.yml
index 194d376713..3d96a9960d 100644
--- a/.gibot.yml
+++ b/.gibot.yml
@@ -2,13 +2,12 @@ stages:
   mark_for_closing:
      days: 30
      labels:
-       - need more info
-       - invalid
-       - can't reproduce
-       - wontfix
-       - information required
+       - status/need more info
+       - status/invalid
+       - status/can't reproduce
+       - status/wontfix
      exclude:
-       - marked for cleanup
+       - status/marked for cleanup
      comment:
        - 'Hello @{author}! There has been no activity on this ticket for over a period of {days} days. I am automatically replying to let you know we will close this ticket within 1 week due to inactivity and consider this resolved.'
        - 'If you believe this is in error, please reply with the requested information.'
@@ -17,11 +16,11 @@ stages:
        close: false
        comment: true
        assign_label:
-         - marked for cleanup
+         - status/marked for cleanup
   clean_up:
      days: 7
      labels:
-       - marked for cleanup
+       - status/marked for cleanup
      comment:
        - 'Hello @{author}! We have detected no activity for {days} days on this ticket. We therefore assume that the original reporter has lost interest or the issue has been resolved.'
        - 'Since we have marked this ticket for deletion, we will be closing it.'
@@ -31,25 +30,24 @@ stages:
        close: true
        comment: true
        assign_label:
-         - closed by bot
+         - status/closed by bot
        remove_label:
-         - marked for cleanup
+         - status/marked for cleanup
   remind_about_old_ticket:
     days: 160
     labels:
-      - bug
-      - critical bug
+      - kind/bug
+      - kind/critical bug
     exclude:
-      - need more info
-      - invalid
-      - can't reproduce
-      - wontfix
-      - information required
-      - marked for cleanup
-      - inactive
+      - status/need more info
+      - status/invalid
+      - status/can't reproduce
+      - status/wontfix
+      - status/marked for cleanup
+      - status/inactive
     comment:
       - 'Hello @acemod/maintainers. This ticket has been open for over {days} days without any activity.'
     action:
       comment: true
       assign_label:
-       - inactive
+       - status/inactive