diff --git a/prow/config/config.yaml b/prow/config/config.yaml
index 3a76aa2c..1a9df2d2 100644
--- a/prow/config/config.yaml
+++ b/prow/config/config.yaml
@@ -28,19 +28,12 @@ branch-protection:
                   - "DCO"
                   - "tide"
                   - "statics"
-                  - "chunks (1)"
-                  - "chunks (2)"
-                  - "chunks (3)"
-                  - "chunks (4)"
-                  - "chunks (5)"
-                  - "chunks (6)"
-                  - "chunks (7)"
-                  - "chunks (8)"
-                  - "chunks (9)"
-                  - "chunks (10)"
-                  - "chunks (11)"
-                  - "chunks (12)"
-                  - "chunks (13)"
+                  - "chunks (1, Unit Test(1))"
+                  - "chunks (2, Unit Test(2))"
+                  - "chunks (3, Tools Test)"
+                  - "chunks (4, Client Integration Test)"
+                  - "chunks (5, TSO Integration Test)"
+                  - "chunks (6, MicroService Integration Test)"
                   - "tso-function-test"
                   - "idc-jenkins-ci/build"
                 strict: true
@@ -1331,7 +1324,24 @@ tide:
               - "idc-jenkins-ci/build"
             skip-unknown-contexts: true
             branches:
-              master: &pd-branch-tide-context-options
+              master:
+                required-contexts:
+                  - "statics"
+                  - "chunks (1, Unit Test(1))"
+                  - "chunks (2, Unit Test(2))"
+                  - "chunks (3, Tools Test)"
+                  - "chunks (4, Client Integration Test)"
+                  - "chunks (5, TSO Integration Test)"
+                  - "chunks (6, MicroService Integration Test)"
+                  - "tso-function-test"
+                skip-unknown-contexts: true
+              release-5.4:
+                required-contexts:
+                  - "statics"
+                  - "tso-function-test"
+                  - "idc-jenkins-ci/test"
+                skip-unknown-contexts: true
+              release-6.0:  &pd-branch-tide-context-options
                 required-contexts:
                   - "statics"
                   - "chunks (1)"
@@ -1346,13 +1356,6 @@ tide:
                   - "chunks (10)"
                   - "tso-function-test"
                 skip-unknown-contexts: true
-              release-5.4:
-                required-contexts:
-                  - "statics"
-                  - "tso-function-test"
-                  - "idc-jenkins-ci/test"
-                skip-unknown-contexts: true
-              release-6.0: *pd-branch-tide-context-options
               release-6.1: *pd-branch-tide-context-options
               release-6.2: *pd-branch-tide-context-options
               release-6.3: *pd-branch-tide-context-options