diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml
index f347b5c..74d221f 100644
--- a/ci/pipeline-template.yml
+++ b/ci/pipeline-template.yml
@@ -81,11 +81,9 @@ groups:
   - Test - JDK 8
   - Test - JDK 8 and Spring.NEXT
   - Test - JDK 8 and Spring.NEXT 5.1
-  - Test - JDK 8 and Spring Data.NEXT
   - Test - JDK 11
   - Test - JDK 11 and Spring.NEXT
   - Test - JDK 11 and Spring.NEXT 5.1
-  - Test - JDK 11 and Spring Data.NEXT
   - Build
 - name: pull-requests
   jobs:
@@ -108,25 +106,8 @@ jobs:
   - task: test
     file: spring-session-data-mongodb-github/ci/test.yml
     params: { PROFILE: "convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-
+  <<: *slack-success
+  <<: *slack-failure
 
 - name: Test - JDK 8 and Spring.NEXT
   serial: true
@@ -139,24 +120,8 @@ jobs:
   - task: test
     file: spring-session-data-mongodb-github/ci/test.yml
     params: { PROFILE: "spring5-next,convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  <<: *slack-success
+  <<: *slack-failure
 
 - name: Test - JDK 8 and Spring.NEXT 5.1
   serial: true
@@ -169,54 +134,8 @@ jobs:
   - task: test
     file: spring-session-data-mongodb-github/ci/test.yml
     params: { PROFILE: "spring51-next,convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-
-- name: Test - JDK 8 and Spring Data.NEXT
-  serial: true
-  public: true
-  plan:
-  - get: spring-session-data-mongodb-github
-    trigger: true
-  - get: openjdk:8-jdk
-    trigger: true
-  - task: test
-    file: spring-session-data-mongodb-github/ci/test.yml
-    params: { PROFILE: "springdata-next,convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  <<: *slack-success
+  <<: *slack-failure
 
 - name: Test - JDK 11
   serial: true
@@ -230,24 +149,8 @@ jobs:
     image: openjdk:11-jdk
     file: spring-session-data-mongodb-github/ci/test.yml
     params: { PROFILE: "convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  <<: *slack-success
+  <<: *slack-failure
 
 - name: Test - JDK 11 and Spring.NEXT
   serial: true
@@ -261,24 +164,8 @@ jobs:
     image: openjdk:11-jdk
     file: spring-session-data-mongodb-github/ci/test.yml
     params: { PROFILE: "spring5-next,convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  <<: *slack-success
+  <<: *slack-failure
 
 - name: Test - JDK 11 and Spring.NEXT 5.1
   serial: true
@@ -292,55 +179,8 @@ jobs:
     image: openjdk:11-jdk
     file: spring-session-data-mongodb-github/ci/test.yml
     params: { PROFILE: "spring51-next,convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-
-- name: Test - JDK 11 and Spring Data.NEXT
-  serial: true
-  public: true
-  plan:
-  - get: spring-session-data-mongodb-github
-    trigger: true
-  - get: openjdk:11-jdk
-    trigger: true
-  - task: test
-    image: openjdk:11-jdk
-    file: spring-session-data-mongodb-github/ci/test.yml
-    params: { PROFILE: "springdata-next,convergence" }
-  on_failure:
-    put: slack
-    params:
-      attachments:
-        - color: danger
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
-          text: "Build has failed"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
-  on_success:
-    put: slack
-    params:
-      attachments:
-        - color: good
-          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
-          text: "Build has succeeded!"
-          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
-          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  <<: *slack-success
+  <<: *slack-failure
 
 - name: Build
   serial: true
@@ -352,11 +192,9 @@ jobs:
       Test - JDK 8,
       Test - JDK 8 and Spring.NEXT,
       Test - JDK 8 and Spring.NEXT 5.1,
-      Test - JDK 8 and Spring Data.NEXT,
       Test - JDK 11,
       Test - JDK 11 and Spring.NEXT,
-      Test - JDK 11 and Spring.NEXT 5.1,
-      Test - JDK 11 and Spring Data.NEXT
+      Test - JDK 11 and Spring.NEXT 5.1
     ]
   - put: spring-session-data-mongodb-status
     params:
@@ -374,7 +212,10 @@ jobs:
       - include:
         - "/**"
         properties:
-          archives: '*:*:*:*@zip zip.name:spring-session-data-mongodb, zip.displayname:Spring Session Data MongoDB, zip.deployed:false'
+          zip.deployed: false
+          zip.displayname: "Spring Session Data MongoDB"
+          zip.name: "spring-session-data-mongodb"
+          zip.type: "docs"
   on_failure:
     aggregate:
     - put: spring-session-data-mongodb-status
@@ -426,9 +267,6 @@ jobs:
     - task: test (JDK 8 and Spring.NEXT 5.1)
       file: spring-session-data-mongodb-github/ci/test.yml
       params: { PROFILE: "spring51-next,convergence" }
-    - task: test (JDK 8 and Spring Data.NEXT)
-      file: spring-session-data-mongodb-github/ci/test.yml
-      params: { PROFILE: "springdata-next,convergence" }
     - task: test (JDK 11)
       image: openjdk:11-jdk
       file: spring-session-data-mongodb-github/ci/test.yml
@@ -441,10 +279,6 @@ jobs:
       image: openjdk:11-jdk
       file: spring-session-data-mongodb-github/ci/test.yml
       params: { PROFILE: "spring51-next,convergence" }
-    - task: test (JDK 11 and Spring Data.NEXT)
-      image: openjdk:11-jdk
-      file: spring-session-data-mongodb-github/ci/test.yml
-      params: { PROFILE: "springdata-next,java11,convergence" }
   on_failure:
     aggregate:
     - put: spring-session-data-mongodb-pull-requests
@@ -497,7 +331,10 @@ jobs:
       - include:
         - "/**"
         properties:
-          archives: '*:*:*:*@zip zip.name:spring-session-data-mongodb, zip.displayname:Spring Session Data MongoDB, zip.deployed:false'
+          zip.deployed: false
+          zip.displayname: "Spring Session Data MongoDB"
+          zip.name: "spring-session-data-mongodb"
+          zip.type: "docs"
   on_failure:
     aggregate:
     - put: spring-session-data-mongodb-status
@@ -616,3 +453,25 @@ jobs:
             text: "Syncing to maven central has succeeded!"
             title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
             title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+
+slack-failure: &slack-failure
+  on_failure:
+    put: slack
+    params:
+      attachments:
+        - color: danger
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
+          text: "Test has failed"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+
+slack-success: &slack-success
+  on_success:
+    put: slack
+    params:
+      attachments:
+        - color: good
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
+          text: "Test has succeeded"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME