diff --git a/core/modules/action/migrations/action_settings.yml b/core/modules/action/migrations/action_settings.yml
index a99676b7a6..4d332f801d 100644
--- a/core/modules/action/migrations/action_settings.yml
+++ b/core/modules/action/migrations/action_settings.yml
@@ -3,6 +3,7 @@ label: Action configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/action/migrations/d6_action.yml b/core/modules/action/migrations/d6_action.yml
index 38b7fb9a2c..6870e88079 100644
--- a/core/modules/action/migrations/d6_action.yml
+++ b/core/modules/action/migrations/d6_action.yml
@@ -2,6 +2,7 @@ id: d6_action
 label: Actions
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: action
 process:
diff --git a/core/modules/action/migrations/d7_action.yml b/core/modules/action/migrations/d7_action.yml
index ccafcaf0b3..21a83aa404 100644
--- a/core/modules/action/migrations/d7_action.yml
+++ b/core/modules/action/migrations/d7_action.yml
@@ -2,6 +2,7 @@ id: d7_action
 label: Actions
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: action
 process:
diff --git a/core/modules/aggregator/migrations/d6_aggregator_feed.yml b/core/modules/aggregator/migrations/d6_aggregator_feed.yml
index 8689d5bcc8..58799dd8f2 100644
--- a/core/modules/aggregator/migrations/d6_aggregator_feed.yml
+++ b/core/modules/aggregator/migrations/d6_aggregator_feed.yml
@@ -3,6 +3,7 @@ label: Aggregator feeds
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: aggregator_feed
 process:
diff --git a/core/modules/aggregator/migrations/d6_aggregator_item.yml b/core/modules/aggregator/migrations/d6_aggregator_item.yml
index 7c991eb761..24663735d4 100644
--- a/core/modules/aggregator/migrations/d6_aggregator_item.yml
+++ b/core/modules/aggregator/migrations/d6_aggregator_item.yml
@@ -3,6 +3,7 @@ label: Aggregator items
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: aggregator_item
 process:
diff --git a/core/modules/aggregator/migrations/d6_aggregator_settings.yml b/core/modules/aggregator/migrations/d6_aggregator_settings.yml
index d6ebf3d642..a620f69eaf 100644
--- a/core/modules/aggregator/migrations/d6_aggregator_settings.yml
+++ b/core/modules/aggregator/migrations/d6_aggregator_settings.yml
@@ -2,6 +2,7 @@ id: d6_aggregator_settings
 label: Aggregator configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/aggregator/migrations/d7_aggregator_feed.yml b/core/modules/aggregator/migrations/d7_aggregator_feed.yml
index 48eb29de8c..90f0815710 100644
--- a/core/modules/aggregator/migrations/d7_aggregator_feed.yml
+++ b/core/modules/aggregator/migrations/d7_aggregator_feed.yml
@@ -3,6 +3,7 @@ label: Aggregator feeds
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: aggregator_feed
 process:
diff --git a/core/modules/aggregator/migrations/d7_aggregator_item.yml b/core/modules/aggregator/migrations/d7_aggregator_item.yml
index 342c5c8cbb..230c3a26ef 100644
--- a/core/modules/aggregator/migrations/d7_aggregator_item.yml
+++ b/core/modules/aggregator/migrations/d7_aggregator_item.yml
@@ -3,6 +3,7 @@ label: Aggregator items
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: aggregator_item
 process:
diff --git a/core/modules/aggregator/migrations/d7_aggregator_settings.yml b/core/modules/aggregator/migrations/d7_aggregator_settings.yml
index 3396950c8a..3e4583ef84 100644
--- a/core/modules/aggregator/migrations/d7_aggregator_settings.yml
+++ b/core/modules/aggregator/migrations/d7_aggregator_settings.yml
@@ -2,6 +2,7 @@ id: d7_aggregator_settings
 label: Aggregator configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/ban/migrations/d7_blocked_ips.yml b/core/modules/ban/migrations/d7_blocked_ips.yml
index 0122dc6810..ce85b5466a 100644
--- a/core/modules/ban/migrations/d7_blocked_ips.yml
+++ b/core/modules/ban/migrations/d7_blocked_ips.yml
@@ -2,6 +2,7 @@ id: d7_blocked_ips
 label: Blocked IPs
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_blocked_ips
 process:
diff --git a/core/modules/block/migrations/d6_block.yml b/core/modules/block/migrations/d6_block.yml
index 1386b18926..abe4fb5ab4 100644
--- a/core/modules/block/migrations/d6_block.yml
+++ b/core/modules/block/migrations/d6_block.yml
@@ -2,6 +2,7 @@ id: d6_block
 label: Blocks
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: block
 process:
diff --git a/core/modules/block/migrations/d7_block.yml b/core/modules/block/migrations/d7_block.yml
index 96b204eaa5..154f63528d 100644
--- a/core/modules/block/migrations/d7_block.yml
+++ b/core/modules/block/migrations/d7_block.yml
@@ -2,6 +2,7 @@ id: d7_block
 label: Blocks
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: block
 process:
diff --git a/core/modules/block_content/migrations/block_content_body_field.yml b/core/modules/block_content/migrations/block_content_body_field.yml
index a40ac204f2..9ed884f99e 100644
--- a/core/modules/block_content/migrations/block_content_body_field.yml
+++ b/core/modules/block_content/migrations/block_content_body_field.yml
@@ -3,6 +3,7 @@ label: Block content body field configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migrations/block_content_entity_display.yml b/core/modules/block_content/migrations/block_content_entity_display.yml
index 9d75e6fb1c..bc0ba4a68a 100644
--- a/core/modules/block_content/migrations/block_content_entity_display.yml
+++ b/core/modules/block_content/migrations/block_content_entity_display.yml
@@ -3,6 +3,7 @@ label: Body field display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migrations/block_content_entity_form_display.yml b/core/modules/block_content/migrations/block_content_entity_form_display.yml
index d8f387e3ef..d8825054c6 100644
--- a/core/modules/block_content/migrations/block_content_entity_form_display.yml
+++ b/core/modules/block_content/migrations/block_content_entity_form_display.yml
@@ -3,6 +3,7 @@ label: Body field form display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migrations/block_content_type.yml b/core/modules/block_content/migrations/block_content_type.yml
index ca797b94e4..55236fb084 100644
--- a/core/modules/block_content/migrations/block_content_type.yml
+++ b/core/modules/block_content/migrations/block_content_type.yml
@@ -3,6 +3,7 @@ label: Block content type
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: embedded_data
   data_rows:
diff --git a/core/modules/block_content/migrations/d6_custom_block.yml b/core/modules/block_content/migrations/d6_custom_block.yml
index 071e4de19a..84e2a4942f 100644
--- a/core/modules/block_content/migrations/d6_custom_block.yml
+++ b/core/modules/block_content/migrations/d6_custom_block.yml
@@ -3,6 +3,7 @@ label: Custom blocks
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_box
 process:
diff --git a/core/modules/block_content/migrations/d7_custom_block.yml b/core/modules/block_content/migrations/d7_custom_block.yml
index 1a9ea1978c..16c659f699 100644
--- a/core/modules/block_content/migrations/d7_custom_block.yml
+++ b/core/modules/block_content/migrations/d7_custom_block.yml
@@ -3,6 +3,7 @@ label: Custom blocks
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_block_custom
 process:
diff --git a/core/modules/book/migrations/d6_book.yml b/core/modules/book/migrations/d6_book.yml
index 94d7a8f0c4..8964ba0713 100644
--- a/core/modules/book/migrations/d6_book.yml
+++ b/core/modules/book/migrations/d6_book.yml
@@ -2,6 +2,7 @@ id: d6_book
 label: Books
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_book
 process:
diff --git a/core/modules/book/migrations/d6_book_settings.yml b/core/modules/book/migrations/d6_book_settings.yml
index d205b8de50..8abfc153de 100644
--- a/core/modules/book/migrations/d6_book_settings.yml
+++ b/core/modules/book/migrations/d6_book_settings.yml
@@ -2,6 +2,7 @@ id: d6_book_settings
 label: Book configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/comment/migrations/d6_comment.yml b/core/modules/comment/migrations/d6_comment.yml
index afab0cb4ca..32978de82e 100644
--- a/core/modules/comment/migrations/d6_comment.yml
+++ b/core/modules/comment/migrations/d6_comment.yml
@@ -3,6 +3,7 @@ label: Comments
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_comment
   constants:
diff --git a/core/modules/comment/migrations/d6_comment_entity_display.yml b/core/modules/comment/migrations/d6_comment_entity_display.yml
index 89e159c47c..0934078784 100644
--- a/core/modules/comment/migrations/d6_comment_entity_display.yml
+++ b/core/modules/comment/migrations/d6_comment_entity_display.yml
@@ -2,6 +2,7 @@ id: d6_comment_entity_display
 label: Comment display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/comment/migrations/d6_comment_entity_form_display.yml b/core/modules/comment/migrations/d6_comment_entity_form_display.yml
index 274f3de96d..b893906f37 100644
--- a/core/modules/comment/migrations/d6_comment_entity_form_display.yml
+++ b/core/modules/comment/migrations/d6_comment_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d6_comment_entity_form_display
 label: Comment field form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/comment/migrations/d6_comment_entity_form_display_subject.yml b/core/modules/comment/migrations/d6_comment_entity_form_display_subject.yml
index 8a68f3195a..b6acaedb39 100644
--- a/core/modules/comment/migrations/d6_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migrations/d6_comment_entity_form_display_subject.yml
@@ -2,6 +2,7 @@ id: d6_comment_entity_form_display_subject
 label: Comment subject form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/comment/migrations/d6_comment_field.yml b/core/modules/comment/migrations/d6_comment_field.yml
index 5cbf5d41f4..3d23dd70a2 100644
--- a/core/modules/comment/migrations/d6_comment_field.yml
+++ b/core/modules/comment/migrations/d6_comment_field.yml
@@ -2,6 +2,7 @@ id: d6_comment_field
 label: Comment field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/comment/migrations/d6_comment_field_instance.yml b/core/modules/comment/migrations/d6_comment_field_instance.yml
index 741ccf2e91..3c9bc1a5f7 100644
--- a/core/modules/comment/migrations/d6_comment_field_instance.yml
+++ b/core/modules/comment/migrations/d6_comment_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_comment_field_instance
 label: Comment field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/comment/migrations/d6_comment_type.yml b/core/modules/comment/migrations/d6_comment_type.yml
index b86ae246e7..582c827f1f 100644
--- a/core/modules/comment/migrations/d6_comment_type.yml
+++ b/core/modules/comment/migrations/d6_comment_type.yml
@@ -2,6 +2,7 @@ id: d6_comment_type
 label: Comment type
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/comment/migrations/d7_comment.yml b/core/modules/comment/migrations/d7_comment.yml
index 0837df91b7..69c94ae520 100644
--- a/core/modules/comment/migrations/d7_comment.yml
+++ b/core/modules/comment/migrations/d7_comment.yml
@@ -3,6 +3,7 @@ label: Comments
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_comment
   constants:
diff --git a/core/modules/comment/migrations/d7_comment_entity_display.yml b/core/modules/comment/migrations/d7_comment_entity_display.yml
index b206552f76..4bad6458e6 100644
--- a/core/modules/comment/migrations/d7_comment_entity_display.yml
+++ b/core/modules/comment/migrations/d7_comment_entity_display.yml
@@ -2,6 +2,7 @@ id: d7_comment_entity_display
 label: Comment display configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/comment/migrations/d7_comment_entity_form_display.yml b/core/modules/comment/migrations/d7_comment_entity_form_display.yml
index 48bb7bc570..99eb5313e2 100644
--- a/core/modules/comment/migrations/d7_comment_entity_form_display.yml
+++ b/core/modules/comment/migrations/d7_comment_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d7_comment_entity_form_display
 label: Comment field form display configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/comment/migrations/d7_comment_entity_form_display_subject.yml b/core/modules/comment/migrations/d7_comment_entity_form_display_subject.yml
index b131c0ab62..703c62e951 100644
--- a/core/modules/comment/migrations/d7_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migrations/d7_comment_entity_form_display_subject.yml
@@ -2,6 +2,7 @@ id: d7_comment_entity_form_display_subject
 label: Comment subject form display configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/comment/migrations/d7_comment_field.yml b/core/modules/comment/migrations/d7_comment_field.yml
index cd7337c7e5..8dee88c1fc 100644
--- a/core/modules/comment/migrations/d7_comment_field.yml
+++ b/core/modules/comment/migrations/d7_comment_field.yml
@@ -2,6 +2,7 @@ id: d7_comment_field
 label: Comment field configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/comment/migrations/d7_comment_field_instance.yml b/core/modules/comment/migrations/d7_comment_field_instance.yml
index 89b39b9241..aa558e53e1 100644
--- a/core/modules/comment/migrations/d7_comment_field_instance.yml
+++ b/core/modules/comment/migrations/d7_comment_field_instance.yml
@@ -2,6 +2,7 @@ id: d7_comment_field_instance
 label: Comment field instance configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/comment/migrations/d7_comment_type.yml b/core/modules/comment/migrations/d7_comment_type.yml
index d54ca09dbd..ad34c4f48a 100644
--- a/core/modules/comment/migrations/d7_comment_type.yml
+++ b/core/modules/comment/migrations/d7_comment_type.yml
@@ -2,6 +2,7 @@ id: d7_comment_type
 label: Comment type
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/config_translation/migrations/d6_system_maintenance_translation.yml b/core/modules/config_translation/migrations/d6_system_maintenance_translation.yml
index e3aa7f17a0..b370914f79 100644
--- a/core/modules/config_translation/migrations/d6_system_maintenance_translation.yml
+++ b/core/modules/config_translation/migrations/d6_system_maintenance_translation.yml
@@ -2,6 +2,7 @@ id: d6_system_maintenance_translation
 label: Maintenance page configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable_translation
   variables:
diff --git a/core/modules/config_translation/migrations/d6_system_site_translation.yml b/core/modules/config_translation/migrations/d6_system_site_translation.yml
index f967f98df9..066038338a 100644
--- a/core/modules/config_translation/migrations/d6_system_site_translation.yml
+++ b/core/modules/config_translation/migrations/d6_system_site_translation.yml
@@ -2,6 +2,7 @@ id: d6_system_site_translation
 label: Site configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable_translation
   constants:
diff --git a/core/modules/config_translation/migrations/d6_user_mail_translation.yml b/core/modules/config_translation/migrations/d6_user_mail_translation.yml
index 450df517d0..801f5678d1 100644
--- a/core/modules/config_translation/migrations/d6_user_mail_translation.yml
+++ b/core/modules/config_translation/migrations/d6_user_mail_translation.yml
@@ -2,6 +2,7 @@ id: d6_user_mail_translation
 label: User mail configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable_translation
   variables:
diff --git a/core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml b/core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml
index 5a3d7cc41e..9b03aa08bf 100644
--- a/core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml
+++ b/core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml
@@ -2,6 +2,7 @@ id: d6_user_profile_field_instance_translation
 label: User profile field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_profile_field_translation
   constants:
diff --git a/core/modules/config_translation/migrations/d6_user_settings_translation.yml b/core/modules/config_translation/migrations/d6_user_settings_translation.yml
index 21822206fd..05ecb15939 100644
--- a/core/modules/config_translation/migrations/d6_user_settings_translation.yml
+++ b/core/modules/config_translation/migrations/d6_user_settings_translation.yml
@@ -2,6 +2,7 @@ id: d6_user_settings_translation
 label: User configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable_translation
   variables:
diff --git a/core/modules/contact/migrations/contact_category.yml b/core/modules/contact/migrations/contact_category.yml
index 3d89a6fced..7b292eb830 100644
--- a/core/modules/contact/migrations/contact_category.yml
+++ b/core/modules/contact/migrations/contact_category.yml
@@ -3,6 +3,7 @@ label: Contact category configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: contact_category
 process:
diff --git a/core/modules/contact/migrations/d6_contact_settings.yml b/core/modules/contact/migrations/d6_contact_settings.yml
index dbe020581e..a91a9fb1bb 100644
--- a/core/modules/contact/migrations/d6_contact_settings.yml
+++ b/core/modules/contact/migrations/d6_contact_settings.yml
@@ -2,6 +2,7 @@ id: d6_contact_settings
 label: Contact configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: contact_settings
   variables:
diff --git a/core/modules/contact/migrations/d7_contact_settings.yml b/core/modules/contact/migrations/d7_contact_settings.yml
index 9feebe5309..282064630c 100644
--- a/core/modules/contact/migrations/d7_contact_settings.yml
+++ b/core/modules/contact/migrations/d7_contact_settings.yml
@@ -2,6 +2,7 @@ id: d7_contact_settings
 label: Contact configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: contact_settings
   variables:
diff --git a/core/modules/content_translation/migrations/d6_taxonomy_term_translation.yml b/core/modules/content_translation/migrations/d6_taxonomy_term_translation.yml
index 11af8cd472..0b42dcfdb9 100644
--- a/core/modules/content_translation/migrations/d6_taxonomy_term_translation.yml
+++ b/core/modules/content_translation/migrations/d6_taxonomy_term_translation.yml
@@ -2,6 +2,7 @@ id: d6_taxonomy_term_translation
 label: Taxonomy terms
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_taxonomy_term
   translations: true
diff --git a/core/modules/dblog/migrations/d6_dblog_settings.yml b/core/modules/dblog/migrations/d6_dblog_settings.yml
index a5d746ef57..a678c21081 100644
--- a/core/modules/dblog/migrations/d6_dblog_settings.yml
+++ b/core/modules/dblog/migrations/d6_dblog_settings.yml
@@ -2,6 +2,7 @@ id: d6_dblog_settings
 label: Database logging configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/dblog/migrations/d7_dblog_settings.yml b/core/modules/dblog/migrations/d7_dblog_settings.yml
index 761e9e40c5..ce7d95ebe9 100644
--- a/core/modules/dblog/migrations/d7_dblog_settings.yml
+++ b/core/modules/dblog/migrations/d7_dblog_settings.yml
@@ -2,6 +2,7 @@ id: d7_dblog_settings
 label: Database logging configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/field/migrations/d6_field.yml b/core/modules/field/migrations/d6_field.yml
index 92c28b203c..ab8313ace7 100644
--- a/core/modules/field/migrations/d6_field.yml
+++ b/core/modules/field/migrations/d6_field.yml
@@ -2,6 +2,7 @@ id: d6_field
 label: Field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processField
 source:
diff --git a/core/modules/field/migrations/d6_field_formatter_settings.yml b/core/modules/field/migrations/d6_field_formatter_settings.yml
index fc97ad0225..6bb3c51d05 100644
--- a/core/modules/field/migrations/d6_field_formatter_settings.yml
+++ b/core/modules/field/migrations/d6_field_formatter_settings.yml
@@ -2,6 +2,7 @@ id: d6_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processFieldFormatter
 source:
diff --git a/core/modules/field/migrations/d6_field_instance.yml b/core/modules/field/migrations/d6_field_instance.yml
index 3a413c14f3..7c23055590 100644
--- a/core/modules/field/migrations/d6_field_instance.yml
+++ b/core/modules/field/migrations/d6_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_field_instance
 label: Field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processFieldInstance
 source:
diff --git a/core/modules/field/migrations/d6_field_instance_widget_settings.yml b/core/modules/field/migrations/d6_field_instance_widget_settings.yml
index b5f6f6d680..abdd37167b 100644
--- a/core/modules/field/migrations/d6_field_instance_widget_settings.yml
+++ b/core/modules/field/migrations/d6_field_instance_widget_settings.yml
@@ -2,6 +2,7 @@ id: d6_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processFieldWidget
 source:
diff --git a/core/modules/field/migrations/d7_field.yml b/core/modules/field/migrations/d7_field.yml
index 1fa00699f9..aba5c9f917 100644
--- a/core/modules/field/migrations/d7_field.yml
+++ b/core/modules/field/migrations/d7_field.yml
@@ -2,6 +2,7 @@ id: d7_field
 label: Field configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processField
 source:
diff --git a/core/modules/field/migrations/d7_field_formatter_settings.yml b/core/modules/field/migrations/d7_field_formatter_settings.yml
index 5c9335ca86..e4830d4180 100644
--- a/core/modules/field/migrations/d7_field_formatter_settings.yml
+++ b/core/modules/field/migrations/d7_field_formatter_settings.yml
@@ -2,6 +2,7 @@ id: d7_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processFieldFormatter
 source:
diff --git a/core/modules/field/migrations/d7_field_instance.yml b/core/modules/field/migrations/d7_field_instance.yml
index 4e1901dc4a..de5f3467f8 100644
--- a/core/modules/field/migrations/d7_field_instance.yml
+++ b/core/modules/field/migrations/d7_field_instance.yml
@@ -2,6 +2,7 @@ id: d7_field_instance
 label: Field instance configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processFieldInstance
 source:
diff --git a/core/modules/field/migrations/d7_field_instance_widget_settings.yml b/core/modules/field/migrations/d7_field_instance_widget_settings.yml
index ac281e1707..14c1a8c6d5 100644
--- a/core/modules/field/migrations/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migrations/d7_field_instance_widget_settings.yml
@@ -2,6 +2,7 @@ id: d7_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration
 field_plugin_method: processFieldWidget
 source:
diff --git a/core/modules/field/migrations/d7_view_modes.yml b/core/modules/field/migrations/d7_view_modes.yml
index fd17138275..394ca14191 100644
--- a/core/modules/field/migrations/d7_view_modes.yml
+++ b/core/modules/field/migrations/d7_view_modes.yml
@@ -2,6 +2,7 @@ id: d7_view_modes
 label: View modes
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_view_mode
 process:
diff --git a/core/modules/file/migrations/d6_file.yml b/core/modules/file/migrations/d6_file.yml
index 5b8b672018..2ae8f8eb44 100644
--- a/core/modules/file/migrations/d6_file.yml
+++ b/core/modules/file/migrations/d6_file.yml
@@ -5,6 +5,7 @@ label: Public files
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_file
   constants:
diff --git a/core/modules/file/migrations/d6_upload.yml b/core/modules/file/migrations/d6_upload.yml
index 8b7e7cbf91..1c34e5873c 100644
--- a/core/modules/file/migrations/d6_upload.yml
+++ b/core/modules/file/migrations/d6_upload.yml
@@ -2,6 +2,7 @@ id: d6_upload
 label: File uploads
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_upload
 process:
diff --git a/core/modules/file/migrations/d6_upload_entity_display.yml b/core/modules/file/migrations/d6_upload_entity_display.yml
index 576bb68c0e..945dad58ae 100644
--- a/core/modules/file/migrations/d6_upload_entity_display.yml
+++ b/core/modules/file/migrations/d6_upload_entity_display.yml
@@ -2,6 +2,7 @@ id: d6_upload_entity_display
 label: Upload display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_upload_instance
   constants:
diff --git a/core/modules/file/migrations/d6_upload_entity_form_display.yml b/core/modules/file/migrations/d6_upload_entity_form_display.yml
index 055749a97e..8e08f3b03c 100644
--- a/core/modules/file/migrations/d6_upload_entity_form_display.yml
+++ b/core/modules/file/migrations/d6_upload_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d6_upload_entity_form_display
 label: Upload form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_upload_instance
   constants:
diff --git a/core/modules/file/migrations/d6_upload_field.yml b/core/modules/file/migrations/d6_upload_field.yml
index ecd095949e..4ef64082f2 100644
--- a/core/modules/file/migrations/d6_upload_field.yml
+++ b/core/modules/file/migrations/d6_upload_field.yml
@@ -2,6 +2,7 @@ id: d6_upload_field
 label: Upload field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   # We do an empty source and a proper destination to have an idmap for
   # migration_dependencies.
diff --git a/core/modules/file/migrations/d6_upload_field_instance.yml b/core/modules/file/migrations/d6_upload_field_instance.yml
index 732153a043..4a2ba60e47 100644
--- a/core/modules/file/migrations/d6_upload_field_instance.yml
+++ b/core/modules/file/migrations/d6_upload_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_upload_field_instance
 label: Upload field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_upload_instance
   constants:
diff --git a/core/modules/file/migrations/d7_file.yml b/core/modules/file/migrations/d7_file.yml
index 7e05a28aeb..3ead3e5ed4 100644
--- a/core/modules/file/migrations/d7_file.yml
+++ b/core/modules/file/migrations/d7_file.yml
@@ -5,6 +5,7 @@ label: Public files
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_file
   scheme: public
diff --git a/core/modules/file/migrations/d7_file_private.yml b/core/modules/file/migrations/d7_file_private.yml
index 51de533867..e0e1705d75 100644
--- a/core/modules/file/migrations/d7_file_private.yml
+++ b/core/modules/file/migrations/d7_file_private.yml
@@ -3,6 +3,7 @@ label: Private files
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_file
   scheme: private
diff --git a/core/modules/file/migrations/file_settings.yml b/core/modules/file/migrations/file_settings.yml
index 9af18085f3..22c0f2252c 100644
--- a/core/modules/file/migrations/file_settings.yml
+++ b/core/modules/file/migrations/file_settings.yml
@@ -3,6 +3,7 @@ label: File configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/filter/migrations/d6_filter_format.yml b/core/modules/filter/migrations/d6_filter_format.yml
index d6bf7f2b95..87491f3092 100644
--- a/core/modules/filter/migrations/d6_filter_format.yml
+++ b/core/modules/filter/migrations/d6_filter_format.yml
@@ -2,6 +2,7 @@ id: d6_filter_format
 label: Filter format configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_filter_format
 process:
diff --git a/core/modules/filter/migrations/d7_filter_format.yml b/core/modules/filter/migrations/d7_filter_format.yml
index 3bac484d49..b7491207bc 100644
--- a/core/modules/filter/migrations/d7_filter_format.yml
+++ b/core/modules/filter/migrations/d7_filter_format.yml
@@ -2,6 +2,7 @@ id: d7_filter_format
 label: Filter format configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_filter_format
 process:
diff --git a/core/modules/filter/migrations/d7_filter_settings.yml b/core/modules/filter/migrations/d7_filter_settings.yml
index f3182e36c9..d716fd8903 100644
--- a/core/modules/filter/migrations/d7_filter_settings.yml
+++ b/core/modules/filter/migrations/d7_filter_settings.yml
@@ -2,6 +2,7 @@ id: d7_filter_settings
 label: Drupal 7 filter settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/forum/migrations/d6_forum_settings.yml b/core/modules/forum/migrations/d6_forum_settings.yml
index 406eed383e..4d4e2d7c2e 100644
--- a/core/modules/forum/migrations/d6_forum_settings.yml
+++ b/core/modules/forum/migrations/d6_forum_settings.yml
@@ -2,6 +2,7 @@ id: d6_forum_settings
 label: Forum configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/forum/migrations/d7_forum_settings.yml b/core/modules/forum/migrations/d7_forum_settings.yml
index 70d690a6e1..8618b4f477 100644
--- a/core/modules/forum/migrations/d7_forum_settings.yml
+++ b/core/modules/forum/migrations/d7_forum_settings.yml
@@ -2,6 +2,7 @@ id: d7_forum_settings
 label: Forum configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/image/migrations/d6_imagecache_presets.yml b/core/modules/image/migrations/d6_imagecache_presets.yml
index bda02584dc..d34da74520 100644
--- a/core/modules/image/migrations/d6_imagecache_presets.yml
+++ b/core/modules/image/migrations/d6_imagecache_presets.yml
@@ -2,6 +2,7 @@ id: d6_imagecache_presets
 label: ImageCache Presets
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_imagecache_presets
 process:
diff --git a/core/modules/image/migrations/d7_image_settings.yml b/core/modules/image/migrations/d7_image_settings.yml
index 354706a55a..e5aec79a82 100644
--- a/core/modules/image/migrations/d7_image_settings.yml
+++ b/core/modules/image/migrations/d7_image_settings.yml
@@ -2,6 +2,7 @@ id: d7_image_settings
 label: Image configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/image/migrations/d7_image_styles.yml b/core/modules/image/migrations/d7_image_styles.yml
index b2b14b06ee..2beabaeb38 100644
--- a/core/modules/image/migrations/d7_image_styles.yml
+++ b/core/modules/image/migrations/d7_image_styles.yml
@@ -2,6 +2,7 @@ id: d7_image_styles
 label: Image styles
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_image_styles
 process:
diff --git a/core/modules/language/migrations/d6_language_content_settings.yml b/core/modules/language/migrations/d6_language_content_settings.yml
index 3bf9078ef0..6d9171ae32 100644
--- a/core/modules/language/migrations/d6_language_content_settings.yml
+++ b/core/modules/language/migrations/d6_language_content_settings.yml
@@ -1,8 +1,8 @@
 id: d6_language_content_settings
 label: Drupal 6 language content settings
-
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_language_content_settings
   constants:
diff --git a/core/modules/language/migrations/d6_language_negotiation_settings.yml b/core/modules/language/migrations/d6_language_negotiation_settings.yml
index 2530ebcee8..a4ae19b87d 100644
--- a/core/modules/language/migrations/d6_language_negotiation_settings.yml
+++ b/core/modules/language/migrations/d6_language_negotiation_settings.yml
@@ -2,6 +2,7 @@ id: d6_language_negotiation_settings
 label: Language negotiation settings
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migrations/d6_language_types.yml b/core/modules/language/migrations/d6_language_types.yml
index 52289c5de1..5c54fc6fb9 100644
--- a/core/modules/language/migrations/d6_language_types.yml
+++ b/core/modules/language/migrations/d6_language_types.yml
@@ -2,6 +2,7 @@ id: d6_language_types
 label: Language types
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migrations/d7_language_content_settings.yml b/core/modules/language/migrations/d7_language_content_settings.yml
index 09437fa455..ba170a489a 100644
--- a/core/modules/language/migrations/d7_language_content_settings.yml
+++ b/core/modules/language/migrations/d7_language_content_settings.yml
@@ -2,6 +2,7 @@ id: d7_language_content_settings
 label: Drupal 7 language content settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_language_content_settings
   constants:
diff --git a/core/modules/language/migrations/d7_language_negotiation_settings.yml b/core/modules/language/migrations/d7_language_negotiation_settings.yml
index 7e113b83d2..a33498d9bf 100644
--- a/core/modules/language/migrations/d7_language_negotiation_settings.yml
+++ b/core/modules/language/migrations/d7_language_negotiation_settings.yml
@@ -2,6 +2,7 @@ id: d7_language_negotiation_settings
 label: Language negotiation settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migrations/d7_language_types.yml b/core/modules/language/migrations/d7_language_types.yml
index 10d6ac768b..017f2e2d6f 100644
--- a/core/modules/language/migrations/d7_language_types.yml
+++ b/core/modules/language/migrations/d7_language_types.yml
@@ -2,6 +2,7 @@ id: d7_language_types
 label: Language types
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migrations/default_language.yml b/core/modules/language/migrations/default_language.yml
index ddb966f5db..0dd8196df0 100644
--- a/core/modules/language/migrations/default_language.yml
+++ b/core/modules/language/migrations/default_language.yml
@@ -3,6 +3,7 @@ label: Default language
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/language/migrations/language.yml b/core/modules/language/migrations/language.yml
index 6ca9c6d54d..36317f503f 100644
--- a/core/modules/language/migrations/language.yml
+++ b/core/modules/language/migrations/language.yml
@@ -3,6 +3,7 @@ label: Languages
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: language
 process:
diff --git a/core/modules/language/migrations/language_prefixes_and_domains.yml b/core/modules/language/migrations/language_prefixes_and_domains.yml
index edc5b549d7..898f31191a 100644
--- a/core/modules/language/migrations/language_prefixes_and_domains.yml
+++ b/core/modules/language/migrations/language_prefixes_and_domains.yml
@@ -3,6 +3,7 @@ label: Language prefixes and domains
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: language
   fetch_all: true
diff --git a/core/modules/locale/migrations/locale_settings.yml b/core/modules/locale/migrations/locale_settings.yml
index dbd7b61b78..02ee317f75 100644
--- a/core/modules/locale/migrations/locale_settings.yml
+++ b/core/modules/locale/migrations/locale_settings.yml
@@ -3,6 +3,7 @@ label: Locale configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/menu_link_content/migrations/d6_menu_links.yml b/core/modules/menu_link_content/migrations/d6_menu_links.yml
index e05efee4a7..7a6bb2c68c 100644
--- a/core/modules/menu_link_content/migrations/d6_menu_links.yml
+++ b/core/modules/menu_link_content/migrations/d6_menu_links.yml
@@ -3,6 +3,7 @@ label: Menu links
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: menu_link
 process:
diff --git a/core/modules/menu_link_content/migrations/d7_menu_links.yml b/core/modules/menu_link_content/migrations/d7_menu_links.yml
index 81d4eb8530..2108870fa1 100644
--- a/core/modules/menu_link_content/migrations/d7_menu_links.yml
+++ b/core/modules/menu_link_content/migrations/d7_menu_links.yml
@@ -3,6 +3,7 @@ label: Menu links
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: menu_link
   constants:
diff --git a/core/modules/menu_ui/migrations/menu_settings.yml b/core/modules/menu_ui/migrations/menu_settings.yml
index d3b1501cfa..962f0b2724 100644
--- a/core/modules/menu_ui/migrations/menu_settings.yml
+++ b/core/modules/menu_ui/migrations/menu_settings.yml
@@ -4,6 +4,7 @@ label: Menu UI configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php
new file mode 100644
index 0000000000..4c41ff425f
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/DestinationCategoryTest.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel\Plugin;
+
+use Drupal\ban\Plugin\migrate\destination\BlockedIP;
+use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
+use Drupal\migrate\Plugin\migrate\destination\ComponentEntityDisplayBase;
+use Drupal\migrate\Plugin\migrate\destination\Config;
+use Drupal\migrate\Plugin\migrate\destination\EntityConfigBase;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
+use Drupal\path\Plugin\migrate\destination\UrlAlias;
+use Drupal\shortcut\Plugin\migrate\destination\ShortcutSetUsers;
+use Drupal\statistics\Plugin\migrate\destination\NodeCounter;
+use Drupal\system\Plugin\migrate\destination\d7\ThemeSettings;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\user\Plugin\migrate\destination\UserData;
+
+/**
+ * Tests that all migrations are tagged as either content or configuration.
+ *
+ * @coversDefaultClass \Drupal\migrate\Plugin\MigrationPluginManager
+ *
+ * @group migrate
+ */
+class DestinationCategoryTest extends MigrateDrupalTestBase {
+
+  use FileSystemModuleDiscoveryDataProviderTrait;
+
+  /**
+   * The migration plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationPluginManager
+   */
+  protected $migrationManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    // Enable all modules.
+    self::$modules = array_keys($this->coreModuleListDataProvider());
+    parent::setUp();
+    $this->migrationManager = \Drupal::service('plugin.manager.migration');
+  }
+
+  /**
+   * @covers ::getDefinitions
+   *
+   */
+  public function testGetGroupedDefinitions() {
+    $definitions = array_keys($this->migrationManager->getDefinitions());
+
+    // Instantiate all migrations.
+    /** @var  \Drupal\migrate\Plugin\Migration[] $migrations */
+    $migrations = $this->migrationManager->createInstances($definitions);
+    foreach ($migrations as $id => $migration) {
+      if (in_array('Configuration', $migration->getMigrationTags())) {
+          if ($migration->getDestinationPlugin() instanceof Config ) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof EntityConfigBase) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof ThemeSettings) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof ComponentEntityDisplayBase) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof ShortcutSetUsers) {
+              $this->assertTrue(TRUE);
+          }
+          else {
+              $this->fail("The migration $id was set as Configuration.");
+          }
+      }
+      elseif (in_array('Content', $migration->getMigrationTags())) {
+          if ($migration->getDestinationPlugin() instanceof EntityContentBase) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof UrlAlias) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof BlockedIP) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof NodeCounter) {
+              $this->assertTrue(TRUE);
+          }
+          elseif ($migration->getDestinationPlugin() instanceof UserData) {
+              $this->assertTrue(TRUE);
+          }
+          else {
+              $this->fail("The migration $id was set as Content.");
+          }
+      }
+      else {
+        $this->fail("The migration $id is not tagged as either content or configuration.");
+      }
+    }
+  }
+
+
+}
diff --git a/core/modules/node/migrations/d6_node_setting_promote.yml b/core/modules/node/migrations/d6_node_setting_promote.yml
index 469083dc26..e04dac6dc1 100644
--- a/core/modules/node/migrations/d6_node_setting_promote.yml
+++ b/core/modules/node/migrations/d6_node_setting_promote.yml
@@ -2,6 +2,7 @@ id: d6_node_setting_promote
 label: Node type 'promote' setting
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migrations/d6_node_setting_status.yml b/core/modules/node/migrations/d6_node_setting_status.yml
index 7c5a8deb81..bcc740956f 100644
--- a/core/modules/node/migrations/d6_node_setting_status.yml
+++ b/core/modules/node/migrations/d6_node_setting_status.yml
@@ -2,6 +2,7 @@ id: d6_node_setting_status
 label: Node type 'status' setting
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migrations/d6_node_setting_sticky.yml b/core/modules/node/migrations/d6_node_setting_sticky.yml
index 77ad6cd9b8..3f4c6aa32f 100644
--- a/core/modules/node/migrations/d6_node_setting_sticky.yml
+++ b/core/modules/node/migrations/d6_node_setting_sticky.yml
@@ -2,6 +2,7 @@ id: d6_node_setting_sticky
 label: Node type 'sticky' setting
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migrations/d6_node_settings.yml b/core/modules/node/migrations/d6_node_settings.yml
index 98b09fbc4b..e9cf576778 100644
--- a/core/modules/node/migrations/d6_node_settings.yml
+++ b/core/modules/node/migrations/d6_node_settings.yml
@@ -2,6 +2,7 @@ id: d6_node_settings
 label: Node configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/node/migrations/d6_node_type.yml b/core/modules/node/migrations/d6_node_type.yml
index 5587ef5179..3afe4bc475 100644
--- a/core/modules/node/migrations/d6_node_type.yml
+++ b/core/modules/node/migrations/d6_node_type.yml
@@ -2,6 +2,7 @@ id: d6_node_type
 label: Node type configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_node_type
   constants:
diff --git a/core/modules/node/migrations/d6_view_modes.yml b/core/modules/node/migrations/d6_view_modes.yml
index 815709b14d..bf49b9a8fe 100644
--- a/core/modules/node/migrations/d6_view_modes.yml
+++ b/core/modules/node/migrations/d6_view_modes.yml
@@ -2,6 +2,7 @@ id: d6_view_modes
 label: View modes
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_view_mode
   constants:
diff --git a/core/modules/node/migrations/d7_node_settings.yml b/core/modules/node/migrations/d7_node_settings.yml
index 46eec7c035..05fe80743e 100644
--- a/core/modules/node/migrations/d7_node_settings.yml
+++ b/core/modules/node/migrations/d7_node_settings.yml
@@ -2,6 +2,7 @@ id: d7_node_settings
 label: Node configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/node/migrations/d7_node_title_label.yml b/core/modules/node/migrations/d7_node_title_label.yml
index 53ae6ea335..9b3051ade6 100644
--- a/core/modules/node/migrations/d7_node_title_label.yml
+++ b/core/modules/node/migrations/d7_node_title_label.yml
@@ -2,6 +2,7 @@ id: d7_node_title_label
 label: Node title label
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/node/migrations/d7_node_type.yml b/core/modules/node/migrations/d7_node_type.yml
index f61bad8c62..1be9cd1ccc 100644
--- a/core/modules/node/migrations/d7_node_type.yml
+++ b/core/modules/node/migrations/d7_node_type.yml
@@ -2,6 +2,7 @@ id: d7_node_type
 label: Node type configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_node_type
   constants:
diff --git a/core/modules/path/migrations/d6_url_alias.yml b/core/modules/path/migrations/d6_url_alias.yml
index 68c4d96dcb..6263ae2a02 100644
--- a/core/modules/path/migrations/d6_url_alias.yml
+++ b/core/modules/path/migrations/d6_url_alias.yml
@@ -2,6 +2,7 @@ id: d6_url_alias
 label: URL aliases
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_url_alias
   constants:
diff --git a/core/modules/path/migrations/d7_url_alias.yml b/core/modules/path/migrations/d7_url_alias.yml
index dffaf46825..03dbff632f 100644
--- a/core/modules/path/migrations/d7_url_alias.yml
+++ b/core/modules/path/migrations/d7_url_alias.yml
@@ -2,6 +2,7 @@ id: d7_url_alias
 label: URL aliases
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_url_alias
   constants:
diff --git a/core/modules/search/migrations/d6_search_settings.yml b/core/modules/search/migrations/d6_search_settings.yml
index 1500a3f06e..378b382f02 100644
--- a/core/modules/search/migrations/d6_search_settings.yml
+++ b/core/modules/search/migrations/d6_search_settings.yml
@@ -2,6 +2,7 @@ id: d6_search_settings
 label: Search configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   constants:
diff --git a/core/modules/search/migrations/d7_search_settings.yml b/core/modules/search/migrations/d7_search_settings.yml
index 74f0ef719e..83515e82eb 100644
--- a/core/modules/search/migrations/d7_search_settings.yml
+++ b/core/modules/search/migrations/d7_search_settings.yml
@@ -2,6 +2,7 @@ id: d7_search_settings
 label: Search configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   constants:
diff --git a/core/modules/search/migrations/search_page.yml b/core/modules/search/migrations/search_page.yml
index fc9b410afe..cf465003ab 100644
--- a/core/modules/search/migrations/search_page.yml
+++ b/core/modules/search/migrations/search_page.yml
@@ -3,6 +3,7 @@ label: Search page configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/shortcut/migrations/d7_shortcut.yml b/core/modules/shortcut/migrations/d7_shortcut.yml
index dac9354338..f4265a8750 100644
--- a/core/modules/shortcut/migrations/d7_shortcut.yml
+++ b/core/modules/shortcut/migrations/d7_shortcut.yml
@@ -2,6 +2,7 @@ id: d7_shortcut
 label: Shortcut links
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_shortcut
   constants:
diff --git a/core/modules/shortcut/migrations/d7_shortcut_set.yml b/core/modules/shortcut/migrations/d7_shortcut_set.yml
index 784178e862..bd951d7e5c 100644
--- a/core/modules/shortcut/migrations/d7_shortcut_set.yml
+++ b/core/modules/shortcut/migrations/d7_shortcut_set.yml
@@ -2,6 +2,7 @@ id: d7_shortcut_set
 label: Shortcut sets
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_shortcut_set
 process:
diff --git a/core/modules/shortcut/migrations/d7_shortcut_set_users.yml b/core/modules/shortcut/migrations/d7_shortcut_set_users.yml
index d0eb219962..9797c0a26f 100644
--- a/core/modules/shortcut/migrations/d7_shortcut_set_users.yml
+++ b/core/modules/shortcut/migrations/d7_shortcut_set_users.yml
@@ -2,6 +2,7 @@ id: d7_shortcut_set_users
 label: Shortcut set user mapping
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_shortcut_set_users
 process:
diff --git a/core/modules/simpletest/migrations/d6_simpletest_settings.yml b/core/modules/simpletest/migrations/d6_simpletest_settings.yml
index ec5e2f262b..9fd70492cb 100644
--- a/core/modules/simpletest/migrations/d6_simpletest_settings.yml
+++ b/core/modules/simpletest/migrations/d6_simpletest_settings.yml
@@ -2,6 +2,7 @@ id: d6_simpletest_settings
 label: Simpletest configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/simpletest/migrations/d7_simpletest_settings.yml b/core/modules/simpletest/migrations/d7_simpletest_settings.yml
index f5e9357466..cac99e8a92 100644
--- a/core/modules/simpletest/migrations/d7_simpletest_settings.yml
+++ b/core/modules/simpletest/migrations/d7_simpletest_settings.yml
@@ -2,6 +2,7 @@ id: d7_simpletest_settings
 label: SimpleTest configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/statistics/migrations/statistics_node_counter.yml b/core/modules/statistics/migrations/statistics_node_counter.yml
index f0f16851b3..748a4a83c0 100644
--- a/core/modules/statistics/migrations/statistics_node_counter.yml
+++ b/core/modules/statistics/migrations/statistics_node_counter.yml
@@ -3,6 +3,7 @@ label: Node counter
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Content
 source:
   plugin: node_counter
 process:
diff --git a/core/modules/statistics/migrations/statistics_settings.yml b/core/modules/statistics/migrations/statistics_settings.yml
index 429d7e11c9..edc0e049f7 100644
--- a/core/modules/statistics/migrations/statistics_settings.yml
+++ b/core/modules/statistics/migrations/statistics_settings.yml
@@ -3,6 +3,7 @@ label: Statistics configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/syslog/migrations/d6_syslog_settings.yml b/core/modules/syslog/migrations/d6_syslog_settings.yml
index 5426271b4a..be47db27e0 100644
--- a/core/modules/syslog/migrations/d6_syslog_settings.yml
+++ b/core/modules/syslog/migrations/d6_syslog_settings.yml
@@ -2,6 +2,7 @@ id: d6_syslog_settings
 label: System log configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/syslog/migrations/d7_syslog_settings.yml b/core/modules/syslog/migrations/d7_syslog_settings.yml
index 357b38a63b..6d990be101 100644
--- a/core/modules/syslog/migrations/d7_syslog_settings.yml
+++ b/core/modules/syslog/migrations/d7_syslog_settings.yml
@@ -2,6 +2,7 @@ id: d7_syslog_settings
 label: Syslog configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d6_date_formats.yml b/core/modules/system/migrations/d6_date_formats.yml
index b28128015c..6d4631a137 100644
--- a/core/modules/system/migrations/d6_date_formats.yml
+++ b/core/modules/system/migrations/d6_date_formats.yml
@@ -2,6 +2,7 @@ id: d6_date_formats
 label: Date format configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable_multirow
   variables:
diff --git a/core/modules/system/migrations/d6_menu.yml b/core/modules/system/migrations/d6_menu.yml
index 25ad0af9bf..4dd2f15766 100644
--- a/core/modules/system/migrations/d6_menu.yml
+++ b/core/modules/system/migrations/d6_menu.yml
@@ -3,6 +3,7 @@ id: d6_menu
 label: Menus
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: menu
 process:
diff --git a/core/modules/system/migrations/d6_system_cron.yml b/core/modules/system/migrations/d6_system_cron.yml
index bf1f6b331d..090d305a3e 100644
--- a/core/modules/system/migrations/d6_system_cron.yml
+++ b/core/modules/system/migrations/d6_system_cron.yml
@@ -2,6 +2,7 @@ id: d6_system_cron
 label: Cron settings
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d6_system_date.yml b/core/modules/system/migrations/d6_system_date.yml
index 7da96c3488..0fdab8b860 100644
--- a/core/modules/system/migrations/d6_system_date.yml
+++ b/core/modules/system/migrations/d6_system_date.yml
@@ -2,6 +2,7 @@ id: d6_system_date
 label: System date configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d6_system_file.yml b/core/modules/system/migrations/d6_system_file.yml
index 902b0e4477..3f7145533a 100644
--- a/core/modules/system/migrations/d6_system_file.yml
+++ b/core/modules/system/migrations/d6_system_file.yml
@@ -2,6 +2,7 @@ id: d6_system_file
 label: File system configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d6_system_performance.yml b/core/modules/system/migrations/d6_system_performance.yml
index 87811c36b8..95566d7447 100644
--- a/core/modules/system/migrations/d6_system_performance.yml
+++ b/core/modules/system/migrations/d6_system_performance.yml
@@ -2,6 +2,7 @@ id: d6_system_performance
 label: Performance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_global_theme_settings.yml b/core/modules/system/migrations/d7_global_theme_settings.yml
index 9b5ff83f5a..9e3e680a28 100644
--- a/core/modules/system/migrations/d7_global_theme_settings.yml
+++ b/core/modules/system/migrations/d7_global_theme_settings.yml
@@ -2,6 +2,7 @@ id: d7_global_theme_settings
 label: D7 global theme settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_menu.yml b/core/modules/system/migrations/d7_menu.yml
index da47b3656d..ce97f656b1 100644
--- a/core/modules/system/migrations/d7_menu.yml
+++ b/core/modules/system/migrations/d7_menu.yml
@@ -2,6 +2,7 @@ id: d7_menu
 label: Menus
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: menu
 process:
diff --git a/core/modules/system/migrations/d7_system_authorize.yml b/core/modules/system/migrations/d7_system_authorize.yml
index ca09567ab2..d3d83881a2 100644
--- a/core/modules/system/migrations/d7_system_authorize.yml
+++ b/core/modules/system/migrations/d7_system_authorize.yml
@@ -2,6 +2,7 @@ id: d7_system_authorize
 label: Drupal 7 file transfer authorize configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_system_cron.yml b/core/modules/system/migrations/d7_system_cron.yml
index 55021c9de9..07835aec73 100644
--- a/core/modules/system/migrations/d7_system_cron.yml
+++ b/core/modules/system/migrations/d7_system_cron.yml
@@ -2,6 +2,7 @@ id: d7_system_cron
 label: Drupal 7 cron settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_system_date.yml b/core/modules/system/migrations/d7_system_date.yml
index f860b07c80..44b7f3fc15 100644
--- a/core/modules/system/migrations/d7_system_date.yml
+++ b/core/modules/system/migrations/d7_system_date.yml
@@ -2,6 +2,7 @@ id: d7_system_date
 label: Drupal 7 system date configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_system_file.yml b/core/modules/system/migrations/d7_system_file.yml
index 9652cb0e51..b9fba89ea6 100644
--- a/core/modules/system/migrations/d7_system_file.yml
+++ b/core/modules/system/migrations/d7_system_file.yml
@@ -2,6 +2,7 @@ id: d7_system_file
 label: Drupal 7 file system configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_system_mail.yml b/core/modules/system/migrations/d7_system_mail.yml
index 520437472c..8706a0ca46 100644
--- a/core/modules/system/migrations/d7_system_mail.yml
+++ b/core/modules/system/migrations/d7_system_mail.yml
@@ -2,6 +2,7 @@ id: d7_system_mail
 label: Drupal 7 system mail configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_system_performance.yml b/core/modules/system/migrations/d7_system_performance.yml
index 0f28dbfc6d..1050010f99 100644
--- a/core/modules/system/migrations/d7_system_performance.yml
+++ b/core/modules/system/migrations/d7_system_performance.yml
@@ -2,6 +2,7 @@ id: d7_system_performance
 label: Drupal 7 performance configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/d7_theme_settings.yml b/core/modules/system/migrations/d7_theme_settings.yml
index 09f5fe1e06..ad789fae8a 100644
--- a/core/modules/system/migrations/d7_theme_settings.yml
+++ b/core/modules/system/migrations/d7_theme_settings.yml
@@ -2,6 +2,7 @@ id: d7_theme_settings
 label: D7 theme settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_theme_settings
   constants:
diff --git a/core/modules/system/migrations/system_image.yml b/core/modules/system/migrations/system_image.yml
index 1f5612f766..7a661f9def 100644
--- a/core/modules/system/migrations/system_image.yml
+++ b/core/modules/system/migrations/system_image.yml
@@ -3,6 +3,7 @@ label: Image toolkit configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/system_image_gd.yml b/core/modules/system/migrations/system_image_gd.yml
index 28e0ab71ee..82601b5341 100644
--- a/core/modules/system/migrations/system_image_gd.yml
+++ b/core/modules/system/migrations/system_image_gd.yml
@@ -3,6 +3,7 @@ label: Image quality configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/system_logging.yml b/core/modules/system/migrations/system_logging.yml
index eea3473bf8..f1b0304f61 100644
--- a/core/modules/system/migrations/system_logging.yml
+++ b/core/modules/system/migrations/system_logging.yml
@@ -3,6 +3,7 @@ label: System logging
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/system_maintenance.yml b/core/modules/system/migrations/system_maintenance.yml
index 183fa10835..da507361c9 100644
--- a/core/modules/system/migrations/system_maintenance.yml
+++ b/core/modules/system/migrations/system_maintenance.yml
@@ -3,6 +3,7 @@ label: Maintenance page configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/system_rss.yml b/core/modules/system/migrations/system_rss.yml
index d6ff5bc4bf..c6ac037bfc 100644
--- a/core/modules/system/migrations/system_rss.yml
+++ b/core/modules/system/migrations/system_rss.yml
@@ -3,6 +3,7 @@ label: RSS configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/system/migrations/system_site.yml b/core/modules/system/migrations/system_site.yml
index 397823c2b5..40b0578602 100644
--- a/core/modules/system/migrations/system_site.yml
+++ b/core/modules/system/migrations/system_site.yml
@@ -3,6 +3,7 @@ label: Site configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   constants:
diff --git a/core/modules/taxonomy/migrations/d6_taxonomy_term.yml b/core/modules/taxonomy/migrations/d6_taxonomy_term.yml
index 9eafee544c..497d7e7e8d 100644
--- a/core/modules/taxonomy/migrations/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migrations/d6_taxonomy_term.yml
@@ -3,6 +3,7 @@ label: Taxonomy terms
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_taxonomy_term
 process:
diff --git a/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary.yml
index 336f502ef7..b05e1164e1 100644
--- a/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary.yml
@@ -2,6 +2,7 @@ id: d6_taxonomy_vocabulary
 label: Taxonomy vocabularies
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary
 process:
diff --git a/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml b/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml
index dbb1793f97..2ac7760eba 100644
--- a/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml
+++ b/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml
@@ -2,6 +2,7 @@ id: d6_taxonomy_vocabulary_translation
 label: Taxonomy vocabularies
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_translation
 process:
diff --git a/core/modules/taxonomy/migrations/d6_vocabulary_entity_display.yml b/core/modules/taxonomy/migrations/d6_vocabulary_entity_display.yml
index 0a62458221..760b6dde39 100644
--- a/core/modules/taxonomy/migrations/d6_vocabulary_entity_display.yml
+++ b/core/modules/taxonomy/migrations/d6_vocabulary_entity_display.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_entity_display
 label: Vocabulary display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_per_type
   constants:
diff --git a/core/modules/taxonomy/migrations/d6_vocabulary_entity_form_display.yml b/core/modules/taxonomy/migrations/d6_vocabulary_entity_form_display.yml
index abd31911c1..da8cd2704b 100644
--- a/core/modules/taxonomy/migrations/d6_vocabulary_entity_form_display.yml
+++ b/core/modules/taxonomy/migrations/d6_vocabulary_entity_form_display.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_entity_form_display
 label: Vocabulary form display configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_per_type
   constants:
diff --git a/core/modules/taxonomy/migrations/d6_vocabulary_field.yml b/core/modules/taxonomy/migrations/d6_vocabulary_field.yml
index 893a95d33a..36974e159c 100644
--- a/core/modules/taxonomy/migrations/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migrations/d6_vocabulary_field.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_field
 label: Vocabulary field configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary
   constants:
diff --git a/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml b/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
index 7e28377866..2c482e2f32 100644
--- a/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
+++ b/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
@@ -2,6 +2,7 @@ id: d6_vocabulary_field_instance
 label: Vocabulary field instance configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_taxonomy_vocabulary_per_type
   constants:
diff --git a/core/modules/taxonomy/migrations/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migrations/d7_taxonomy_vocabulary.yml
index 751f018371..2271385ab3 100644
--- a/core/modules/taxonomy/migrations/d7_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migrations/d7_taxonomy_vocabulary.yml
@@ -2,6 +2,7 @@ id: d7_taxonomy_vocabulary
 label: Taxonomy vocabularies
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_taxonomy_vocabulary
 process:
diff --git a/core/modules/taxonomy/migrations/taxonomy_settings.yml b/core/modules/taxonomy/migrations/taxonomy_settings.yml
index 28505db58a..43baf0b54d 100644
--- a/core/modules/taxonomy/migrations/taxonomy_settings.yml
+++ b/core/modules/taxonomy/migrations/taxonomy_settings.yml
@@ -3,6 +3,7 @@ label: Taxonomy configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/text/migrations/text_settings.yml b/core/modules/text/migrations/text_settings.yml
index a38de856d7..4f62dd6228 100644
--- a/core/modules/text/migrations/text_settings.yml
+++ b/core/modules/text/migrations/text_settings.yml
@@ -3,6 +3,7 @@ label: Drupal teaser length configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/tracker/migrations/d7_tracker_node.yml b/core/modules/tracker/migrations/d7_tracker_node.yml
index 02645d7e8a..1b94842224 100644
--- a/core/modules/tracker/migrations/d7_tracker_node.yml
+++ b/core/modules/tracker/migrations/d7_tracker_node.yml
@@ -2,6 +2,7 @@ id: d7_tracker_node
 label: Tracker node
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_tracker_node
 process:
diff --git a/core/modules/tracker/migrations/d7_tracker_settings.yml b/core/modules/tracker/migrations/d7_tracker_settings.yml
index ac61d7dbe2..17087a3b1f 100644
--- a/core/modules/tracker/migrations/d7_tracker_settings.yml
+++ b/core/modules/tracker/migrations/d7_tracker_settings.yml
@@ -2,6 +2,7 @@ id: d7_tracker_settings
 label: Tracker settings
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/tracker/migrations/d7_tracker_user.yml b/core/modules/tracker/migrations/d7_tracker_user.yml
index ae3c51d69e..ff6277546b 100644
--- a/core/modules/tracker/migrations/d7_tracker_user.yml
+++ b/core/modules/tracker/migrations/d7_tracker_user.yml
@@ -2,6 +2,7 @@ id: d7_tracker_user
 label: Tracker user
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: d7_tracker_user
 process:
diff --git a/core/modules/update/migrations/update_settings.yml b/core/modules/update/migrations/update_settings.yml
index a7adfd7dc6..4bd4a2b60f 100644
--- a/core/modules/update/migrations/update_settings.yml
+++ b/core/modules/update/migrations/update_settings.yml
@@ -3,6 +3,7 @@ label: Update configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migrations/d6_profile_values.yml b/core/modules/user/migrations/d6_profile_values.yml
index 5530ca5b45..2d6d51d29b 100644
--- a/core/modules/user/migrations/d6_profile_values.yml
+++ b/core/modules/user/migrations/d6_profile_values.yml
@@ -3,6 +3,7 @@ label: Profile values
 class: Drupal\user\Plugin\migrate\ProfileValues
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_profile_field_values
 process:
diff --git a/core/modules/user/migrations/d6_user.yml b/core/modules/user/migrations/d6_user.yml
index 35d31da875..b3d84534d0 100644
--- a/core/modules/user/migrations/d6_user.yml
+++ b/core/modules/user/migrations/d6_user.yml
@@ -3,6 +3,7 @@ label: User accounts
 audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_user
 process:
diff --git a/core/modules/user/migrations/d6_user_contact_settings.yml b/core/modules/user/migrations/d6_user_contact_settings.yml
index 0d9a2289a6..7777d379ef 100644
--- a/core/modules/user/migrations/d6_user_contact_settings.yml
+++ b/core/modules/user/migrations/d6_user_contact_settings.yml
@@ -2,6 +2,7 @@ id: d6_user_contact_settings
 label: User contact settings
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_user
   constants:
diff --git a/core/modules/user/migrations/d6_user_mail.yml b/core/modules/user/migrations/d6_user_mail.yml
index 9b25b943f7..d80ed32c7b 100644
--- a/core/modules/user/migrations/d6_user_mail.yml
+++ b/core/modules/user/migrations/d6_user_mail.yml
@@ -2,6 +2,7 @@ id: d6_user_mail
 label: User mail configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migrations/d6_user_picture_file.yml b/core/modules/user/migrations/d6_user_picture_file.yml
index 3518d7a6e3..f654849530 100644
--- a/core/modules/user/migrations/d6_user_picture_file.yml
+++ b/core/modules/user/migrations/d6_user_picture_file.yml
@@ -2,6 +2,7 @@ id: d6_user_picture_file
 label: User pictures
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: d6_user_picture_file
   constants:
diff --git a/core/modules/user/migrations/d6_user_role.yml b/core/modules/user/migrations/d6_user_role.yml
index 1d224f4897..d6c2ca941f 100644
--- a/core/modules/user/migrations/d6_user_role.yml
+++ b/core/modules/user/migrations/d6_user_role.yml
@@ -2,6 +2,7 @@ id: d6_user_role
 label: User roles
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: d6_user_role
 process:
diff --git a/core/modules/user/migrations/d6_user_settings.yml b/core/modules/user/migrations/d6_user_settings.yml
index 2dfa946fcb..911682a278 100644
--- a/core/modules/user/migrations/d6_user_settings.yml
+++ b/core/modules/user/migrations/d6_user_settings.yml
@@ -2,6 +2,7 @@ id: d6_user_settings
 label: User configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migrations/d7_user.yml b/core/modules/user/migrations/d7_user.yml
index ee70db782e..00eabf2c7f 100644
--- a/core/modules/user/migrations/d7_user.yml
+++ b/core/modules/user/migrations/d7_user.yml
@@ -3,6 +3,7 @@ label: User accounts
 audit: true
 migration_tags:
   - Drupal 7
+  - Content
 class: Drupal\user\Plugin\migrate\User
 source:
   plugin: d7_user
diff --git a/core/modules/user/migrations/d7_user_flood.yml b/core/modules/user/migrations/d7_user_flood.yml
index db08753451..8dc7b0b171 100644
--- a/core/modules/user/migrations/d7_user_flood.yml
+++ b/core/modules/user/migrations/d7_user_flood.yml
@@ -2,6 +2,7 @@ id: d7_user_flood
 label: User flood configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migrations/d7_user_mail.yml b/core/modules/user/migrations/d7_user_mail.yml
index 81051ef47f..d7b25149ce 100644
--- a/core/modules/user/migrations/d7_user_mail.yml
+++ b/core/modules/user/migrations/d7_user_mail.yml
@@ -2,6 +2,7 @@ id: d7_user_mail
 label: User mail configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:
diff --git a/core/modules/user/migrations/d7_user_role.yml b/core/modules/user/migrations/d7_user_role.yml
index 5f887574e8..46885d7e75 100644
--- a/core/modules/user/migrations/d7_user_role.yml
+++ b/core/modules/user/migrations/d7_user_role.yml
@@ -2,6 +2,7 @@ id: d7_user_role
 label: User roles
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: d7_user_role
 process:
diff --git a/core/modules/user/migrations/user_picture_entity_display.yml b/core/modules/user/migrations/user_picture_entity_display.yml
index 3f404d6f57..9bd5d80408 100644
--- a/core/modules/user/migrations/user_picture_entity_display.yml
+++ b/core/modules/user/migrations/user_picture_entity_display.yml
@@ -3,6 +3,7 @@ label: User picture display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: user_picture_instance
   constants:
diff --git a/core/modules/user/migrations/user_picture_entity_form_display.yml b/core/modules/user/migrations/user_picture_entity_form_display.yml
index 4d0f8bc616..6acd19fa4b 100644
--- a/core/modules/user/migrations/user_picture_entity_form_display.yml
+++ b/core/modules/user/migrations/user_picture_entity_form_display.yml
@@ -3,6 +3,7 @@ label: User picture form display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: user_picture_instance
   constants:
diff --git a/core/modules/user/migrations/user_picture_field.yml b/core/modules/user/migrations/user_picture_field.yml
index 7f7134de92..95c2d6a1f2 100644
--- a/core/modules/user/migrations/user_picture_field.yml
+++ b/core/modules/user/migrations/user_picture_field.yml
@@ -3,6 +3,7 @@ label: User picture field configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   # We do an empty source and a proper destination to have an idmap for
   # dependencies.
diff --git a/core/modules/user/migrations/user_picture_field_instance.yml b/core/modules/user/migrations/user_picture_field_instance.yml
index 4332e09e50..ef1415f1d7 100644
--- a/core/modules/user/migrations/user_picture_field_instance.yml
+++ b/core/modules/user/migrations/user_picture_field_instance.yml
@@ -3,6 +3,7 @@ label: User picture field instance configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: user_picture_instance
   constants:
diff --git a/core/modules/user/migrations/user_profile_entity_display.yml b/core/modules/user/migrations/user_profile_entity_display.yml
index f4353ddda3..7336636269 100644
--- a/core/modules/user/migrations/user_profile_entity_display.yml
+++ b/core/modules/user/migrations/user_profile_entity_display.yml
@@ -3,6 +3,7 @@ label: User profile display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
diff --git a/core/modules/user/migrations/user_profile_entity_form_display.yml b/core/modules/user/migrations/user_profile_entity_form_display.yml
index cfabd76312..44a5c5333d 100644
--- a/core/modules/user/migrations/user_profile_entity_form_display.yml
+++ b/core/modules/user/migrations/user_profile_entity_form_display.yml
@@ -3,6 +3,7 @@ label: User profile form display configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
diff --git a/core/modules/user/migrations/user_profile_field.yml b/core/modules/user/migrations/user_profile_field.yml
index 3ba0eee48c..94d7defd06 100644
--- a/core/modules/user/migrations/user_profile_field.yml
+++ b/core/modules/user/migrations/user_profile_field.yml
@@ -3,6 +3,7 @@ label: User profile field configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
diff --git a/core/modules/user/migrations/user_profile_field_instance.yml b/core/modules/user/migrations/user_profile_field_instance.yml
index b9f213b392..50e0bd2839 100644
--- a/core/modules/user/migrations/user_profile_field_instance.yml
+++ b/core/modules/user/migrations/user_profile_field_instance.yml
@@ -3,6 +3,7 @@ label: User profile field instance configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: profile_field
   constants:
