diff --git a/docs/api/changes.md b/docs/api/changes.md
index 963bc554..31f88917 100644
--- a/docs/api/changes.md
+++ b/docs/api/changes.md
@@ -202,6 +202,8 @@ fields are not listed here):
 
 - `archived` -> `status` and `archived` (see "Asset status" below)
 - `flags` -> `flag`
+- `files` -> `file`
+- `images` -> `image`
 - `description` -> `notes`
 
 #### Asset status
diff --git a/modules/asset/animal/config/install/field.field.asset.animal.file.yml b/modules/asset/animal/config/install/field.field.asset.animal.file.yml
new file mode 100644
index 00000000..5f9de711
--- /dev/null
+++ b/modules/asset/animal/config/install/field.field.asset.animal.file.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.animal
+    - field.storage.asset.file
+  module:
+    - file
+id: asset.animal.file
+field_name: file
+entity_type: asset
+bundle: animal
+label: Files
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/animal/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'csv doc docx gz kml kmz logz mp3 odp ods odt ogg pdf ppt pptx tar txt wav xls xlsx zip'
+  max_filesize: ''
+  description_field: true
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
diff --git a/modules/asset/animal/config/install/field.field.asset.animal.image.yml b/modules/asset/animal/config/install/field.field.asset.animal.image.yml
new file mode 100644
index 00000000..1da2cd93
--- /dev/null
+++ b/modules/asset/animal/config/install/field.field.asset.animal.image.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.animal
+    - field.storage.asset.image
+  module:
+    - image
+id: asset.animal.image
+field_name: image
+entity_type: asset
+bundle: animal
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/animal/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: false
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/modules/asset/compost/config/install/field.field.asset.compost.file.yml b/modules/asset/compost/config/install/field.field.asset.compost.file.yml
new file mode 100644
index 00000000..efde2c51
--- /dev/null
+++ b/modules/asset/compost/config/install/field.field.asset.compost.file.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.compost
+    - field.storage.asset.file
+  module:
+    - file
+id: asset.compost.file
+field_name: file
+entity_type: asset
+bundle: compost
+label: Files
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/compost/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'csv doc docx gz kml kmz logz mp3 odp ods odt ogg pdf ppt pptx tar txt wav xls xlsx zip'
+  max_filesize: ''
+  description_field: true
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
diff --git a/modules/asset/compost/config/install/field.field.asset.compost.image.yml b/modules/asset/compost/config/install/field.field.asset.compost.image.yml
new file mode 100644
index 00000000..f847ac57
--- /dev/null
+++ b/modules/asset/compost/config/install/field.field.asset.compost.image.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.compost
+    - field.storage.asset.image
+  module:
+    - image
+id: asset.compost.image
+field_name: image
+entity_type: asset
+bundle: compost
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/compost/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: false
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/modules/asset/equipment/config/install/field.field.asset.equipment.file.yml b/modules/asset/equipment/config/install/field.field.asset.equipment.file.yml
new file mode 100644
index 00000000..23429966
--- /dev/null
+++ b/modules/asset/equipment/config/install/field.field.asset.equipment.file.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.equipment
+    - field.storage.asset.file
+  module:
+    - file
+id: asset.equipment.file
+field_name: file
+entity_type: asset
+bundle: equipment
+label: Files
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/equipment/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'csv doc docx gz kml kmz logz mp3 odp ods odt ogg pdf ppt pptx tar txt wav xls xlsx zip'
+  max_filesize: ''
+  description_field: true
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
diff --git a/modules/asset/equipment/config/install/field.field.asset.equipment.image.yml b/modules/asset/equipment/config/install/field.field.asset.equipment.image.yml
new file mode 100644
index 00000000..0efa8bb9
--- /dev/null
+++ b/modules/asset/equipment/config/install/field.field.asset.equipment.image.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.equipment
+    - field.storage.asset.image
+  module:
+    - image
+id: asset.equipment.image
+field_name: image
+entity_type: asset
+bundle: equipment
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/equipment/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: false
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/modules/asset/group/config/install/field.field.asset.group.file.yml b/modules/asset/group/config/install/field.field.asset.group.file.yml
new file mode 100644
index 00000000..7a1f5fbb
--- /dev/null
+++ b/modules/asset/group/config/install/field.field.asset.group.file.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.group
+    - field.storage.asset.file
+  module:
+    - file
+id: asset.group.file
+field_name: file
+entity_type: asset
+bundle: group
+label: Files
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/group/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'csv doc docx gz kml kmz logz mp3 odp ods odt ogg pdf ppt pptx tar txt wav xls xlsx zip'
+  max_filesize: ''
+  description_field: true
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
diff --git a/modules/asset/group/config/install/field.field.asset.group.image.yml b/modules/asset/group/config/install/field.field.asset.group.image.yml
new file mode 100644
index 00000000..bbec5ba4
--- /dev/null
+++ b/modules/asset/group/config/install/field.field.asset.group.image.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.group
+    - field.storage.asset.image
+  module:
+    - image
+id: asset.group.image
+field_name: image
+entity_type: asset
+bundle: group
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/group/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: false
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/modules/asset/plant/config/install/field.field.asset.plant.file.yml b/modules/asset/plant/config/install/field.field.asset.plant.file.yml
new file mode 100644
index 00000000..63355c3f
--- /dev/null
+++ b/modules/asset/plant/config/install/field.field.asset.plant.file.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.plant
+    - field.storage.asset.file
+  module:
+    - file
+id: asset.plant.file
+field_name: file
+entity_type: asset
+bundle: plant
+label: Files
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/plant/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'csv doc docx gz kml kmz logz mp3 odp ods odt ogg pdf ppt pptx tar txt wav xls xlsx zip'
+  max_filesize: ''
+  description_field: true
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
diff --git a/modules/asset/plant/config/install/field.field.asset.plant.image.yml b/modules/asset/plant/config/install/field.field.asset.plant.image.yml
new file mode 100644
index 00000000..6e38071c
--- /dev/null
+++ b/modules/asset/plant/config/install/field.field.asset.plant.image.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.plant
+    - field.storage.asset.image
+  module:
+    - image
+id: asset.plant.image
+field_name: image
+entity_type: asset
+bundle: plant
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/plant/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: false
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/modules/asset/sensor/config/install/field.field.asset.sensor.file.yml b/modules/asset/sensor/config/install/field.field.asset.sensor.file.yml
new file mode 100644
index 00000000..169ca532
--- /dev/null
+++ b/modules/asset/sensor/config/install/field.field.asset.sensor.file.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.sensor
+    - field.storage.asset.file
+  module:
+    - file
+id: asset.sensor.file
+field_name: file
+entity_type: asset
+bundle: sensor
+label: Files
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/sensor/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'csv doc docx gz kml kmz logz mp3 odp ods odt ogg pdf ppt pptx tar txt wav xls xlsx zip'
+  max_filesize: ''
+  description_field: true
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
diff --git a/modules/asset/sensor/config/install/field.field.asset.sensor.image.yml b/modules/asset/sensor/config/install/field.field.asset.sensor.image.yml
new file mode 100644
index 00000000..317602da
--- /dev/null
+++ b/modules/asset/sensor/config/install/field.field.asset.sensor.image.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - asset.type.sensor
+    - field.storage.asset.image
+  module:
+    - image
+id: asset.sensor.image
+field_name: image
+entity_type: asset
+bundle: sensor
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'farm/asset/sensor/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: false
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/modules/core/field/config/install/field.storage.asset.file.yml b/modules/core/field/config/install/field.storage.asset.file.yml
new file mode 100644
index 00000000..7f4520c3
--- /dev/null
+++ b/modules/core/field/config/install/field.storage.asset.file.yml
@@ -0,0 +1,22 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - asset
+    - file
+id: asset.file
+field_name: file
+entity_type: asset
+type: file
+settings:
+  display_field: false
+  display_default: false
+  uri_scheme: private
+  target_type: file
+module: file
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/core/field/config/install/field.storage.asset.image.yml b/modules/core/field/config/install/field.storage.asset.image.yml
new file mode 100644
index 00000000..4041df12
--- /dev/null
+++ b/modules/core/field/config/install/field.storage.asset.image.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - asset
+    - file
+    - image
+id: asset.image
+field_name: image
+entity_type: asset
+type: image
+settings:
+  uri_scheme: private
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+module: image
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false