diff --git a/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts b/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts
index 22e7e7c33c..79cadf2ab6 100644
--- a/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts
+++ b/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts
@@ -148,7 +148,7 @@ describe('WorkbasketInformationComponent', () => {
 
   it('should display custom fields correctly', () => {
     const customFields = debugElement.nativeElement.getElementsByClassName('custom-fields__form-field');
-    expect(customFields.length).toBe(3); //mock data has custom1->4 but engineConfig disables custom3 -> [1,2,4]
+    expect(customFields.length).toBe(5); //mock data has custom1->8 but engineConfig disables custom3, custom5, custom7 -> [1,2,4,6,8]
   });
 
   it('should create clone of workbasket when workbasket value changes', () => {
@@ -199,7 +199,7 @@ describe('WorkbasketInformationComponent', () => {
 
   it('should not show custom fields with attribute visible = false', () => {
     const inputCustoms = debugElement.queryAll(By.css('.custom-fields__input'));
-    expect(inputCustoms).toHaveLength(3);
+    expect(inputCustoms).toHaveLength(5);
   });
 
   it('should save custom field input at position 4 when custom field at position 3 is not visible', fakeAsync(() => {
diff --git a/web/src/app/shared/models/workbasket-summary.ts b/web/src/app/shared/models/workbasket-summary.ts
index 4d21d154d4..99620cf1c3 100644
--- a/web/src/app/shared/models/workbasket-summary.ts
+++ b/web/src/app/shared/models/workbasket-summary.ts
@@ -12,6 +12,10 @@ export interface WorkbasketSummary {
   custom2?: string;
   custom3?: string;
   custom4?: string;
+  custom5?: string;
+  custom6?: string;
+  custom7?: string;
+  custom8?: string;
   orgLevel1?: string;
   orgLevel2?: string;
   orgLevel3?: string;
diff --git a/web/src/app/shared/models/workbasket.ts b/web/src/app/shared/models/workbasket.ts
index 54116ab81d..b0bce3074f 100644
--- a/web/src/app/shared/models/workbasket.ts
+++ b/web/src/app/shared/models/workbasket.ts
@@ -13,6 +13,10 @@ export interface Workbasket {
   custom2?: string;
   custom3?: string;
   custom4?: string;
+  custom5?: string;
+  custom6?: string;
+  custom7?: string;
+  custom8?: string;
   orgLevel1?: string;
   orgLevel2?: string;
   orgLevel3?: string;
@@ -25,4 +29,4 @@ export interface Workbasket {
   selected?: boolean;
 }
 
-export const customFieldCount: number = 4;
+export const customFieldCount: number = 8;
diff --git a/web/src/app/shared/store/mock-data/mock-store.ts b/web/src/app/shared/store/mock-data/mock-store.ts
index e8253e2afe..5e869d0313 100644
--- a/web/src/app/shared/store/mock-data/mock-store.ts
+++ b/web/src/app/shared/store/mock-data/mock-store.ts
@@ -29,7 +29,15 @@ export const engineConfigurationMock = {
           custom3: {
             field: '',
             visible: false
-          }
+          },
+          custom5: {
+            field: '',
+            visible: false
+          },
+          custom7: {
+            field: '',
+            visible: false
+          },
         },
         'access-items': {
           accessId: {
@@ -100,6 +108,10 @@ export const selectedWorkbasketMock: Workbasket = {
   custom2: '',
   custom3: '',
   custom4: '',
+  custom5: '',
+  custom6: '',
+  custom7: '',
+  custom8: '',
   orgLevel1: '',
   orgLevel2: '',
   orgLevel3: '',
@@ -205,6 +217,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -223,6 +239,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -241,6 +261,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -259,6 +283,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -277,6 +305,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -295,6 +327,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -313,6 +349,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -331,6 +371,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -349,6 +393,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -367,6 +415,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -385,6 +437,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -403,6 +459,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -421,6 +481,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -439,6 +503,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: 'custom4z',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -457,6 +525,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: 'custom2',
       custom3: 'custom3',
       custom4: 'custom4',
+      custom5: 'custom5',
+      custom6: 'custom6',
+      custom7: 'custom7',
+      custom8: 'custom8',
       orgLevel1: 'versicherung',
       orgLevel2: 'abteilung',
       orgLevel3: 'projekt',
@@ -475,6 +547,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -493,6 +569,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -511,6 +591,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -529,6 +613,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -547,6 +635,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: 'custom2',
       custom3: 'custom3',
       custom4: 'custom4',
+      custom5: 'custom5',
+      custom6: 'custom6',
+      custom7: 'custom7',
+      custom8: 'custom8',
       orgLevel1: 'orgl1',
       orgLevel2: 'orgl2',
       orgLevel3: 'orgl3',
@@ -565,6 +657,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -583,6 +679,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: 'custom20',
       custom3: '',
       custom4: 'custom4',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -601,6 +701,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: 'cust2',
       custom3: 'cust3',
       custom4: 'cust4',
+      custom5: 'cust5',
+      custom6: 'cust6',
+      custom7: 'cust7',
+      custom8: 'cust8',
       orgLevel1: 'orgl1',
       orgLevel2: 'orgl2',
       orgLevel3: 'orgl3',
@@ -619,6 +723,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -637,6 +745,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -656,6 +768,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -674,6 +790,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -692,6 +812,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -710,6 +834,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -728,6 +856,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -747,6 +879,10 @@ export const workbasketAvailableDistributionTargets = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -803,6 +939,10 @@ export const workbasketReadStateMock = {
         custom2: '',
         custom3: '',
         custom4: '',
+        custom5: '',
+        custom6: '',
+        custom7: '',
+        custom8: '',
         orgLevel1: '',
         orgLevel2: '',
         orgLevel3: '',
@@ -821,6 +961,10 @@ export const workbasketReadStateMock = {
         custom2: 'custom2',
         custom3: 'custom3',
         custom4: 'custom4',
+        custom5: 'custom5',
+        custom6: 'custom6',
+        custom7: 'custom7',
+        custom8: 'custom8',
         orgLevel1: 'versicherung',
         orgLevel2: 'abteilung',
         orgLevel3: 'projekt',
@@ -839,6 +983,10 @@ export const workbasketReadStateMock = {
         custom2: '',
         custom3: '',
         custom4: '',
+        custom5: '',
+        custom6: '',
+        custom7: '',
+        custom8: '',
         orgLevel1: '',
         orgLevel2: '',
         orgLevel3: '',
@@ -857,6 +1005,10 @@ export const workbasketReadStateMock = {
         custom2: '',
         custom3: '',
         custom4: '',
+        custom5: '',
+        custom6: '',
+        custom7: '',
+        custom8: '',
         orgLevel1: '',
         orgLevel2: '',
         orgLevel3: '',
@@ -875,6 +1027,10 @@ export const workbasketReadStateMock = {
         custom2: '',
         custom3: '',
         custom4: '',
+        custom5: '',
+        custom6: '',
+        custom7: '',
+        custom8: '',
         orgLevel1: '',
         orgLevel2: '',
         orgLevel3: '',
@@ -903,6 +1059,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: 'xyz4',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -921,6 +1081,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -939,6 +1103,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -957,6 +1125,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -975,6 +1147,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -993,6 +1169,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -1011,6 +1191,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -1029,6 +1213,10 @@ export const workbasketReadStateMock = {
       custom2: '',
       custom3: '',
       custom4: '',
+      custom5: '',
+      custom6: '',
+      custom7: '',
+      custom8: '',
       orgLevel1: '',
       orgLevel2: '',
       orgLevel3: '',
@@ -1056,6 +1244,10 @@ export const workbasketReadStateMock = {
         custom2: '',
         custom3: 'xyz4',
         custom4: '',
+        custom5: '',
+        custom6: '',
+        custom7: '',
+        custom8: '',
         orgLevel1: '',
         orgLevel2: '',
         orgLevel3: '',
@@ -1074,6 +1266,10 @@ export const workbasketReadStateMock = {
         custom2: '',
         custom3: '',
         custom4: '',
+        custom5: '',
+        custom6: '',
+        custom7: '',
+        custom8: '',
         orgLevel1: '',
         orgLevel2: '',
         orgLevel3: '',
@@ -1092,6 +1288,10 @@ export const workbasketReadStateMock = {
         custom2: '',
         custom3: '',
         custom4: '',
+        custom5: '',
+        custom6: '',
+        custom7: '',
+        custom8: '',
         orgLevel1: '',
         orgLevel2: '',
         orgLevel3: '',
diff --git a/web/src/environments/data-sources/taskana-customization.json b/web/src/environments/data-sources/taskana-customization.json
index d89fb7158f..5bbd55fb32 100644
--- a/web/src/environments/data-sources/taskana-customization.json
+++ b/web/src/environments/data-sources/taskana-customization.json
@@ -12,6 +12,18 @@
         "custom3": {
           "field": "",
           "visible": false
+        },
+        "custom6": {
+          "field": "",
+          "visible": false
+        },
+        "custom7": {
+          "field": "",
+          "visible": false
+        },
+        "custom8": {
+          "field": "",
+          "visible": false
         }
       },
       "access-items": {