diff --git a/CHANGELOG.md b/CHANGELOG.md
index 085f918b7..99c8fc9b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,6 @@
 # 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/api/stream-legal-entity/openapi.yaml b/api/stream-legal-entity/openapi.yaml
index 43d609b4b..f505b4b26 100644
--- a/api/stream-legal-entity/openapi.yaml
+++ b/api/stream-legal-entity/openapi.yaml
@@ -254,12 +254,6 @@ 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 a108eb65a..6cc596c12 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","TASK_INSTANCE", "TASK_DEFINITION", "CASE_DEFINITION", "CASE_INSTANCE", "PROCESS_DEFINITION", "PROCESS_INSTANCE" ]
+      "enum" : [ "ARRANGEMENTS", "JOURNEYS", "REPOSITORIES", "CUSTOMERS", "CUSTOM" ]
     },
     "name" : {
       "maxLength" : 128,