diff --git a/README.adoc b/README.adoc
index a0f51636..96fa1da2 100644
--- a/README.adoc
+++ b/README.adoc
@@ -19,47 +19,27 @@ Check the matrix below to see the status of supported versions:
 | Job | `1.0` status (master) | `0.25` status (0.25.x)
 
 | Test - JDK 8
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
+| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/test-jdk8/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
 | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"]
 
 | Test - JDK 8 and Spring 5.0 (snapshots)
-| Requires Spring Framework 5.1+
+| Requires Spring Framework 5.2+
 | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"]
 
 | Test - JDK 8 and Spring 5.1 (snapshots)
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
+| Requires Spring Framework 5.2+
 | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"]
 
-| Test - JDK 8 and Spring 5.2 (snapshots)
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208%20and%20Spring%205.2%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
-| Not supported
-
 | Test - JDK 11
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
-| Not supported
-
-| Test - JDK 11 and Spring 5.1 (snapshots)
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
-| Not supported
-
-| Test - JDK 11 and Spring 5.2 (snapshots)
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
+| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/test-jdk11/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
 | Not supported
 
 | Test - JDK 13
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
-| Not supported
-
-| Test - JDK 13 and Spring 5.1 (snapshots)
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013%20and%20Spring%205.2%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
-| Not supported
-
-| Test - JDK 13 and Spring 5.2 (snapshots)
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013%20and%20Spring%205.2%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
+| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/test-jdk13/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
 | Not supported
 
 | Build - Deploy to repo.spring.io
-| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
+| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
 | image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"]
 |===
 
diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml
index d4bdb1d8..65cb769a 100644
--- a/ci/pipeline-template.yml
+++ b/ci/pipeline-template.yml
@@ -136,10 +136,10 @@ resources:
 groups:
 - name: spring-hateoas
   jobs:
-  - Test - JDK 8
-  - Test - JDK 11
-  - Test - JDK 13
-  - Build
+  - test-jdk8
+  - test-jdk11
+  - test-jdk13
+  - build
 - name: spring-hateoas-examples
   jobs:
   - spring-hateoas-examples-test-jdk8
@@ -161,7 +161,7 @@ groups:
   - 8-jdk-with-graphviz:latest
 
 jobs:
-- name: Test - JDK 8
+- name: test-jdk8
   serial: true
   public: true
   plan:
@@ -174,13 +174,13 @@ jobs:
     params: { PROFILE: "non-existent" }
   <<: *slack-test-failure
 
-- name: Test - JDK 11
+- name: test-jdk11
   serial: true
   public: true
   plan:
   - get: spring-hateoas-github
     trigger: true
-    passed: [ Test - JDK 8 ]
+    passed: [ test-jdk8 ]
   - get: openjdk:11-jdk
     trigger: true
   - task: test
@@ -189,13 +189,13 @@ jobs:
     params: { PROFILE: "non-existant" }
   <<: *slack-test-failure
 
-- name: Test - JDK 13
+- name: test-jdk13
   serial: true
   public: true
   plan:
   - get: spring-hateoas-github
     trigger: true
-    passed: [ Test - JDK 8 ]
+    passed: [ test-jdk8 ]
   - get: openjdk:13-jdk
     trigger: true
   - task: test
@@ -204,15 +204,15 @@ jobs:
     params: { PROFILE: "non-existant" }
   <<: *slack-test-failure
 
-- name: Build
+- name: build
   serial: true
   public: true
   plan:
   - get: spring-hateoas-github
     trigger: true
     passed: [
-      Test - JDK 11,
-      Test - JDK 13
+      test-jdk11,
+      test-jdk13
     ]
   - get: 8-jdk-with-graphviz:latest
     trigger: true
@@ -279,14 +279,14 @@ jobs:
       path: spring-hateoas-github
       status: pending
   - aggregate:
-    - task: test (JDK 8)
+    - task: test-jdk8
       file: spring-hateoas-github/ci/test.yml
       params: { PROFILE: "ci" }
-    - task: test (JDK 11)
+    - task: test-jdk11
       image: openjdk:11-jdk
       file: spring-hateoas-github/ci/test.yml
       params: { PROFILE: "ci" }
-    - task: test (JDK 13)
+    - task: test-jdk13
       image: openjdk:13-jdk
       file: spring-hateoas-github/ci/test.yml
       params: { PROFILE: "ci" }
@@ -451,14 +451,14 @@ jobs:
       path: spring-hateoas-examples-github
       status: pending
   - aggregate:
-    - task: test (JDK 8)
+    - task: test-jdk8
       file: spring-hateoas-examples-github/ci/test.yml
       params: { PROFILE: "non-existent" }
-    - task: test (JDK 11)
+    - task: test-jdk11
       image: openjdk:11-jdk
       file: spring-hateoas-examples-github/ci/test.yml
       params: { PROFILE: "non-existent" }
-    - task: test (JDK 13)
+    - task: test-jdk13
       image: openjdk:13-jdk
       file: spring-hateoas-examples-github/ci/test.yml
       params: { PROFILE: "non-existent" }