diff --git a/.triage-policies.yml b/.triage-policies.yml
index 6483115fe1a375397f0938dbd8804af833329ef5..317fa16475b8dd0c0524d7e582085eeccb412741 100644
--- a/.triage-policies.yml
+++ b/.triage-policies.yml
@@ -19,47 +19,11 @@ resource_rules:
           labels:
             - "Status: Need triage"
           comment: |
-            This issue is unlabelled after 3 days. It needs attention. Please take care of this before the end of #{2.days.from_now.strftime('%Y-%m-%d')}
+            Thanks a lot for reporting your experience with Funkwhale! :whale:
+            A member of the team will have a look at this ticket as soon as possible. Afterwards this ticket will follow
+            our issue workflow. We would really appreciate if you could check back to answer questions. Enjoy!
 
-      - name: Untriaged issues
-        conditions:
-          date:
-            attribute: updated_at
-            condition: older_than
-            interval_type: days
-            interval: 5
-          state: opened
-          labels:
-            - "Status: Need triage"
-          no_additional_labels: true
-        limits:
-          most_recent: 20
-        actions:
-          mention:
-            - funkwhale/steering-commitee
-          comment: |
-            This issue is untriaged after 5 days. It needs attention. Please take care of this before the end of #{2.days.from_now.strftime('%Y-%m-%d')}
-
-      - name: Untriaged issues (close)
-        conditions:
-          date:
-            attribute: updated_at
-            condition: older_than
-            interval_type: days
-            interval: 7
-          state: opened
-          labels:
-            - "Status: Need triage"
-
-          no_additional_labels: true
-        limits:
-          most_recent: 10
-        actions:
-          comment: |
-            This issue is unlabelled after 7 days, and was closed automatically as such. Please label it and reopen itif it is still relevant.
-          status: close
-
-      - name: Inactive unscheduled issues (close)
+      - name: Inactive issues waiting for input (close)
         conditions:
           date:
             attribute: updated_at
@@ -67,11 +31,12 @@ resource_rules:
             interval_type: days
             interval: 90
           state: opened
-          milestone: none
           upvotes:
             attribute: upvotes
             condition: less_than
             threshold: 3
+          labels:
+            - "Status: input wanted"
         limits:
           most_recent: 10
         actions:
@@ -81,8 +46,8 @@ resource_rules:
 
             We're posting this message because this issue meets the following criteria:
 
+            * We requested input which is required to proceed working on this
             * No activity in the past 90 days (since {{updated_at}})
-            * No milestone (unscheduled)
             * Less than 3 upvotes
 
             We're closing it to avoid cluttering the issue tracker, but if if you think
@@ -90,7 +55,7 @@ resource_rules:
 
             Thanks!
 
-      - name: Inactive unscheduled issues (warn)
+      - name: Inactive issues waiting for input (warn)
         conditions:
           date:
             attribute: updated_at
@@ -99,8 +64,9 @@ resource_rules:
             interval: 60
           state: opened
           milestone: none
-          forbidden_labels:
+          labels:
             - "Status: input wanted"
+            - "Status: Needs reproduction"
         limits:
           most_recent: 10
         actions:
@@ -109,8 +75,8 @@ resource_rules:
 
             We're posting this message because this issue meets the following criteria:
 
+            * We requested input which is required to proceed working on this
             * No activity in the past 60 days (since {{updated_at}})
-            * No milestone (unscheduled)
 
             We'd like to ask you to help us out and determine how we should act on this issue.
 
@@ -126,8 +92,14 @@ resource_rules:
 
             Thanks for your help! :heart:
 
-          labels:
-            - "Status: input wanted"
+      - name: Make sure each issue has a Status label
+        conditions:
+          forbidden_labels: 
+            - "Status: { Blocked, Draft, input wanted, Needs Design, Needs reproduction, Need triage, Ready, Review wanted }"
+          state: opened
+        actions:
+          labels: 
+            - "Status: Need triage"
 
   merge_requests:
     rules: