diff --git a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
index 14f3ee7..e0c9110 100644
--- a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
+++ b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
@@ -1,24 +1,25 @@
-uuid: 8a57272e-e5d7-45cf-94f2-9bdb9c734cb9
+uuid: 57f257e9-5e60-4342-87b0-2bcfbc50b560
 langcode: en
 status: true
 dependencies:
   config:
     - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_trainer
-    - field.storage.paragraph.field_trainer
+    - field.storage.oc_case.field_project
+    - field.storage.oc_case.field_training_status
+    - field.storage.oc_case.field_training_type
     - opencase_cases.oc_case_type.training
     - system.menu.opencase
+    - user.role.authenticated
   module:
     - datetime
-    - entity_reference_revisions
     - opencase_cases
+    - opencase_entities
+    - options
     - paragraphs
     - user
-_core:
-  default_config_hash: Of0WcqhFUX1HB3oQfisZ29RgEzlpmN7kiIRRYU2nzMo
 id: oc_organisation.client.trainings
 label: Trainings
-display_label: true
+display_label: false
 name: trainings
 description: ''
 base_entity_type_id: oc_organisation
@@ -29,6 +30,12 @@ field_type_config:
   display: block_2
   arguments: ''
 field_type_condition:
+  'entity_bundle:oc_organisation':
+    id: 'entity_bundle:oc_organisation'
+    negate: false
+    context_mapping:
+      oc_organisation: entity_extra_field.target_entity
+    bundles: {  }
   route:
     id: route
     negate: false
diff --git a/config/field.field.oc_case.training.field_trainer.yml b/config/field.field.oc_case.training.field_trainer.yml
deleted file mode 100644
index eee6f4f..0000000
--- a/config/field.field.oc_case.training.field_trainer.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: c722bc26-a033-4f9d-8f04-a65b247e113b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_trainer
-    - opencase_cases.oc_case_type.training
-    - paragraphs.paragraphs_type.trainer
-  module:
-    - entity_reference_revisions
-_core:
-  default_config_hash: o2DTDQHJfJCyEoBkkDbvkoaAFv-DRtgFn_nGl4in-0s
-id: oc_case.training.field_trainer
-field_name: field_trainer
-entity_type: oc_case
-bundle: training
-label: Trainers
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:paragraph'
-  handler_settings:
-    target_bundles:
-      trainer: trainer
-    negate: 0
-    target_bundles_drag_drop:
-      trainer:
-        weight: 2
-        enabled: true
-field_type: entity_reference_revisions
diff --git a/config/field.storage.oc_case.field_trainer.yml b/config/field.storage.oc_case.field_trainer.yml
deleted file mode 100644
index ccf0eeb..0000000
--- a/config/field.storage.oc_case.field_trainer.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 89971a6a-34b5-41aa-869d-a343c2f96e55
-langcode: en
-status: true
-dependencies:
-  module:
-    - entity_reference_revisions
-    - opencase_cases
-    - paragraphs
-_core:
-  default_config_hash: Pmyzz5YecwFkTwL_KrDpiCYyP24kjfrahEfTN4OZOc4
-id: oc_case.field_trainer
-field_name: field_trainer
-entity_type: oc_case
-type: entity_reference_revisions
-settings:
-  target_type: paragraph
-module: entity_reference_revisions
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false