diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 827fe92..758420b 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -231,3 +231,42 @@ config_dependencies:
       label: 'Theme dependencies'
       sequence:
         - type: string
+
+block_settings:
+  type: mapping
+  label: 'Block settings'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Description'
+    label_display:
+      type: string
+      label: 'Display title'
+    cache:
+      type: mapping
+      label: 'Cache settings'
+      mapping:
+        max_age:
+          type: integer
+          label: 'Maximum age'
+        contexts:
+          type: sequence
+          label: 'Vary by context'
+          sequence:
+            - type: string
+              label: 'Context'
+    status:
+      type: boolean
+      label: 'Status'
+    info:
+      type: label
+      label: 'Admin info'
+    view_mode:
+      type: string
+      label: 'View mode'
+    provider:
+      type: string
+      label: 'Provider'
diff --git a/core/modules/aggregator/config/schema/aggregator.schema.yml b/core/modules/aggregator/config/schema/aggregator.schema.yml
index acb9059..db7c93a 100644
--- a/core/modules/aggregator/config/schema/aggregator.schema.yml
+++ b/core/modules/aggregator/config/schema/aggregator.schema.yml
@@ -37,8 +37,8 @@ aggregator.settings:
           type: integer
           label: 'Number of items shown in listing pages'
 
-block.plugin.aggregator_feed_block:
-  type: block.plugin.*
+block.settings.aggregator_feed_block:
+  type: block_settings
   label: 'Aggregator feed block'
   mapping:
     block_count:
diff --git a/core/modules/block/config/schema/block.schema.yml b/core/modules/block/config/schema/block.schema.yml
index d295a4e..9d6daa9 100644
--- a/core/modules/block/config/schema/block.schema.yml
+++ b/core/modules/block/config/schema/block.schema.yml
@@ -63,7 +63,7 @@ block.block.*:
       type: string
       label: 'Plugin'
     settings:
-      type: block.plugin.[%parent.plugin]
+      type: block.settings.[%parent.plugin]
     langcode:
       type: string
       label: 'Default language'
@@ -71,41 +71,5 @@ block.block.*:
       type: config_dependencies
       label: 'Dependencies'
 
-block.plugin.*:
-  type: mapping
-  label: 'Block settings'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Description'
-    label_display:
-      type: string
-      label: 'Display title'
-    cache:
-      type: mapping
-      label: 'Cache settings'
-      mapping:
-        max_age:
-          type: integer
-          label: 'Maximum age'
-        contexts:
-          type: sequence
-          label: 'Vary by context'
-          sequence:
-            - type: string
-              label: 'Context'
-    status:
-      type: boolean
-      label: 'Status'
-    info:
-      type: label
-      label: 'Admin info'
-    view_mode:
-      type: string
-      label: 'View mode'
-    provider:
-      type: string
-      label: 'Provider'
+block.settings.*:
+  type: block_settings
diff --git a/core/modules/book/config/schema/book.schema.yml b/core/modules/book/config/schema/book.schema.yml
index baaedcf..20d18bc 100644
--- a/core/modules/book/config/schema/book.schema.yml
+++ b/core/modules/book/config/schema/book.schema.yml
@@ -25,8 +25,8 @@ book.settings:
       type: string
       label: 'Content type for child pages'
 
-block.plugin.book_navigation:
-  type: block.plugin.*
+block.settings.book_navigation:
+  type: block_settings
   label: 'Book navigation block'
   mapping:
     block_mode:
diff --git a/core/modules/forum/config/schema/forum.schema.yml b/core/modules/forum/config/schema/forum.schema.yml
index a3cc1bc..f74587c 100644
--- a/core/modules/forum/config/schema/forum.schema.yml
+++ b/core/modules/forum/config/schema/forum.schema.yml
@@ -39,8 +39,8 @@ forum.settings:
       type: string
       label: 'Forum vocabulary ID'
 
-block.plugin.forum_active_block:
-  type: block.plugin.*
+block.settings.forum_active_block:
+  type: block_settings
   label: 'Active forum topics block'
   mapping:
     properties:
@@ -52,8 +52,8 @@ block.plugin.forum_active_block:
       type: integer
       label: 'Block count'
 
-block.plugin.forum_new_block:
-  type: block.plugin.*
+block.settings.forum_new_block:
+  type: block_settings
   label: 'New forum topics block'
   mapping:
     properties:
diff --git a/core/modules/node/config/schema/node.schema.yml b/core/modules/node/config/schema/node.schema.yml
index 954b5b6..1d23050 100644
--- a/core/modules/node/config/schema/node.schema.yml
+++ b/core/modules/node/config/schema/node.schema.yml
@@ -139,8 +139,8 @@ action.configuration.node_unpublish_by_keyword_action:
         - type: sequence
           label: 'Keyword'
 
-block.plugin.node_syndicate_block:
-  type: block.plugin.*
+block.settings.node_syndicate_block:
+  type: block_settings
   label: 'Syndicate block'
   mapping:
     block_count:
diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml
index 55eddd0..fcf031d 100644
--- a/core/modules/system/config/schema/system.schema.yml
+++ b/core/modules/system/config/schema/system.schema.yml
@@ -391,8 +391,8 @@ system.theme.global:
   type: theme_settings
   label: 'Theme global settings'
 
-block.plugin.system_branding_block:
-  type: block.plugin.*
+block.settings.system_branding_block:
+  type: block_settings
   label: 'Branding block'
   mapping:
     use_site_logo: