diff --git a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
index 1ee3831..7a5d2f6 100644
--- a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
+++ b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
@@ -15,21 +15,14 @@ dependencies:
     - image.style.thumbnail
     - opencase_entities.oc_activity_type.trainer_debrief
   module:
-    - datetime
     - image
 id: oc_activity.trainer_debrief.default
 targetEntityType: oc_activity
 bundle: trainer_debrief
 mode: default
 content:
-  activity_date_time:
-    type: datetime_default
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   field_issues_and_difficulties:
-    weight: 5
+    weight: 3
     settings:
       rows: 5
       placeholder: ''
@@ -37,7 +30,7 @@ content:
     type: string_textarea
     region: content
   field_issues_with_group_dynamics:
-    weight: 6
+    weight: 4
     settings:
       rows: 5
       placeholder: ''
@@ -45,14 +38,14 @@ content:
     type: string_textarea
     region: content
   field_number_of_participants:
-    weight: 1
+    weight: 0
     settings:
       placeholder: ''
     third_party_settings: {  }
     type: number
     region: content
   field_photo:
-    weight: 9
+    weight: 7
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
@@ -60,7 +53,7 @@ content:
     type: image_image
     region: content
   field_trainer:
-    weight: 11
+    weight: 8
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -70,7 +63,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_what_came_up_for_the_group:
-    weight: 4
+    weight: 2
     settings:
       rows: 5
       placeholder: ''
@@ -78,7 +71,7 @@ content:
     type: string_textarea
     region: content
   field_what_could_be_improved_for:
-    weight: 8
+    weight: 6
     settings:
       rows: 5
       placeholder: ''
@@ -86,7 +79,7 @@ content:
     type: string_textarea
     region: content
   field_what_did_facilitators_do_w:
-    weight: 3
+    weight: 1
     settings:
       rows: 5
       placeholder: ''
@@ -94,7 +87,7 @@ content:
     type: string_textarea
     region: content
   field_what_real_scenarios_or_inc:
-    weight: 7
+    weight: 5
     settings:
       rows: 5
       placeholder: ''
@@ -103,11 +96,12 @@ content:
     region: content
   status:
     type: boolean_checkbox
-    weight: 12
+    weight: 9
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
 hidden:
+  activity_date_time: true
   name: true
   time_taken: true
diff --git a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml
index 7bd6bb3..5c187dc 100644
--- a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml
+++ b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml
@@ -14,7 +14,6 @@ dependencies:
     - field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc
     - opencase_entities.oc_activity_type.trainer_debrief
   module:
-    - datetime
     - image
     - user
 id: oc_activity.trainer_debrief.default
@@ -22,31 +21,22 @@ targetEntityType: oc_activity
 bundle: trainer_debrief
 mode: default
 content:
-  activity_date_time:
-    label: above
-    type: datetime_default
-    settings:
-      format_type: short
-      timezone_override: ''
-    weight: 0
-    region: content
-    third_party_settings: {  }
   field_issues_and_difficulties:
-    weight: 6
+    weight: 4
     label: above
     settings: {  }
     third_party_settings: {  }
     type: basic_string
     region: content
   field_issues_with_group_dynamics:
-    weight: 7
+    weight: 5
     label: above
     settings: {  }
     third_party_settings: {  }
     type: basic_string
     region: content
   field_number_of_participants:
-    weight: 2
+    weight: 1
     label: above
     settings:
       thousand_separator: ''
@@ -55,7 +45,7 @@ content:
     type: number_integer
     region: content
   field_photo:
-    weight: 10
+    weight: 8
     label: above
     settings:
       image_style: ''
@@ -64,7 +54,7 @@ content:
     type: image
     region: content
   field_trainer:
-    weight: 12
+    weight: 9
     label: above
     settings:
       link: true
@@ -72,28 +62,28 @@ content:
     type: entity_reference_label
     region: content
   field_what_came_up_for_the_group:
-    weight: 5
+    weight: 3
     label: above
     settings: {  }
     third_party_settings: {  }
     type: basic_string
     region: content
   field_what_could_be_improved_for:
-    weight: 9
+    weight: 7
     label: above
     settings: {  }
     third_party_settings: {  }
     type: basic_string
     region: content
   field_what_did_facilitators_do_w:
-    weight: 4
+    weight: 2
     label: above
     settings: {  }
     third_party_settings: {  }
     type: basic_string
     region: content
   field_what_real_scenarios_or_inc:
-    weight: 8
+    weight: 6
     label: above
     settings: {  }
     third_party_settings: {  }
@@ -102,11 +92,12 @@ content:
   name:
     label: hidden
     type: string
-    weight: 1
+    weight: 0
     region: content
     settings:
       link_to_entity: false
     third_party_settings: {  }
 hidden:
+  activity_date_time: true
   search_api_excerpt: true
   time_taken: true
diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml
index c914520..ac9c55e 100644
--- a/config/views.view.debriefs.yml
+++ b/config/views.view.debriefs.yml
@@ -7,7 +7,6 @@ dependencies:
     - opencase_entities.oc_activity_type.trainer_debrief
     - user.role.authenticated
   module:
-    - datetime
     - opencase_cases
     - opencase_entities
     - user
@@ -184,72 +183,6 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-        activity_date_time:
-          id: activity_date_time
-          table: oc_activity_field_data
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Date
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: oc_activity
-          entity_field: activity_date_time
-          plugin_id: field
         status:
           id: status
           table: oc_activity_field_data
@@ -317,6 +250,73 @@ display:
           entity_type: oc_activity
           entity_field: status
           plugin_id: field
+        created:
+          id: created
+          table: oc_activity_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Created
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: oc_activity
+          entity_field: created
+          plugin_id: field
         view_oc_activity:
           id: view_oc_activity
           table: oc_activity