diff --git a/core/modules/block_content/migration_templates/block_content_entity_display.yml b/core/modules/block_content/migration_templates/block_content_entity_display.yml
new file mode 100644
index 0000000..59c6440
--- /dev/null
+++ b/core/modules/block_content/migration_templates/block_content_entity_display.yml
@@ -0,0 +1,32 @@
+id: block_content_entity_display
+label: Body field display configuration
+migration_tags:
+  - Drupal 6
+  - Drupal 7
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      entity_type: block_content
+      bundle: basic
+      view_mode: default
+      field_name: body
+  ids:
+    entity_type:
+      type: string
+    bundle:
+      type: string
+    view_mode:
+      type: string
+    field_name:
+      type: string
+process:
+  entity_type: entity_type
+  bundle: bundle
+  view_mode: view_mode
+  field_name: field_name
+destination:
+  plugin: component_entity_display
+migration_dependencies:
+  required:
+    - block_content_body_field
diff --git a/core/modules/block_content/migration_templates/block_content_entity_form_display.yml b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml
new file mode 100644
index 0000000..ff3d581
--- /dev/null
+++ b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml
@@ -0,0 +1,32 @@
+id: block_content_entity_form_display
+label: Body field form display configuration
+migration_tags:
+  - Drupal 6
+  - Drupal 7
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      entity_type: block_content
+      bundle: basic
+      form_mode: default
+      field_name: body
+  ids:
+    entity_type:
+      type: string
+    bundle:
+      type: string
+    form_mode:
+      type: string
+    field_name:
+      type: string
+process:
+  entity_type: entity_type
+  bundle: bundle
+  form_mode: form_mode
+  field_name: field_name
+destination:
+  plugin: component_entity_form_display
+migration_dependencies:
+  required:
+    - block_content_body_field
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 643c116..6ffa476 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -70,6 +70,14 @@ class MigrateUpgradeForm extends ConfirmFormBase {
       'source_module' => 'block',
       'destination_module' => 'block',
     ],
+    'block_content_entity_form_display' => [
+      'source_module' => 'block',
+      'destination_module' => 'block_content',
+    ],
+    'block_content_entity_display' => [
+      'source_module' => 'block',
+      'destination_module' => 'block_content',
+    ],
     'block_content_body_field' => [
       'source_module' => 'block',
       'destination_module' => 'block_content',