diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99c8fc9b0..085f918b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [6.18.0](https://github.com/Backbase/stream-services/compare/6.17.0...6.18.0)
+### Added
+- Extended the data group types to include; `CASE_DEFINITION`, `CASE_INSTANCE`, `PROCESS_DEFINITION`, `PROCESS_INSTANCE`, `TASK_DEFINITION`, `TASK_INSTANCE`. 
+
 ## [6.17.0](https://github.com/Backbase/stream-services/compare/6.16.0...6.17.0)
 ### Added
 - Improved logging for Job Roles ingestion
diff --git a/README.md b/README.md
index 560dc5656..8625b1685 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,8 @@ You can find listed here the API specification containing the opinionated model
 
 | Stream [version](https://github.com/Backbase/stream-services/releases) | Banking Services   | Java | Spring Boot |
 |------------------------------------------------------------------------|--------------------|------|-------------|
-| 6.2.0 to latest                                                        | 2024.10            | 21   | 3.3         |
+| 6.18.0 to latest                                                       | 2025.04            | 21   | 3.3         |
+| 6.2.0 to 6.17.0                                                        | 2024.10            | 21   | 3.3         |
 | 6.0.0 to 6.1.0                                                         | 2024.10            | 21   | 3.2         |
 | 5.10.0 to 5.16.0                                                       | 2024.09-LTS        | 21   | 3.2         |
 | 5.0.0 to 5.9.x                                                         | 2024.04            | 21   | 3.2         |
diff --git a/api/stream-legal-entity/openapi.yaml b/api/stream-legal-entity/openapi.yaml
index f505b4b26..43d609b4b 100644
--- a/api/stream-legal-entity/openapi.yaml
+++ b/api/stream-legal-entity/openapi.yaml
@@ -254,6 +254,12 @@ components:
             - REPOSITORIES
             - CUSTOMERS
             - CUSTOM
+            - TASK_INSTANCE
+            - TASK_DEFINITION
+            - CASE_DEFINITION
+            - CASE_INSTANCE
+            - PROCESS_DEFINITION
+            - PROCESS_INSTANCE
         name:
           maxLength: 128
           minLength: 1
diff --git a/stream-compositions/events/events/product/base-product-group.json b/stream-compositions/events/events/product/base-product-group.json
index 6cc596c12..a108eb65a 100644
--- a/stream-compositions/events/events/product/base-product-group.json
+++ b/stream-compositions/events/events/product/base-product-group.json
@@ -8,7 +8,7 @@
     "productGroupType" : {
       "type" : "string",
       "default" : "ARRANGEMENTS",
-      "enum" : [ "ARRANGEMENTS", "JOURNEYS", "REPOSITORIES", "CUSTOMERS", "CUSTOM" ]
+      "enum" : [ "ARRANGEMENTS", "JOURNEYS", "REPOSITORIES", "CUSTOMERS", "CUSTOM","TASK_INSTANCE", "TASK_DEFINITION", "CASE_DEFINITION", "CASE_INSTANCE", "PROCESS_DEFINITION", "PROCESS_INSTANCE" ]
     },
     "name" : {
       "maxLength" : 128,