diff -u /dev/null /dev/null
--- /dev/null
+++ /dev/null
@@ -1,42 +1,3 @@
-# Schema for the configuration files of the Custom Block module.
-
-custom_block.type.*:
-  type: mapping
-  label: 'Custom block type settings'
-  mapping:
-    id:
-      type: string
-      label: 'Machine-readable name'
-    uuid:
-      type: string
-      label: 'UUID'
-    label:
-      type: label
-      label: 'Label'
-    revision:
-      type: integer
-      label: 'Create new revision'
-    description:
-      type: text
-      label: 'Description'
-    status:
-      type: boolean
-      label: 'Status'
-    langcode:
-      type: string
-      label: 'Default language'
-# Schema for the configuration files of the Custom Block module.
-
-custom_block.type.*:
-  type: config_entity
-  label: 'Custom block type settings'
-  mapping:
-    revision:
-      type: integer
-      label: 'Create new revision'
-    description:
-      type: text
-      label: 'Description'
     label:
       type: label
       label: 'Label'
diff -u b/core/modules/block_content/config/schema/block_content.schema.yml b/core/modules/block_content/config/schema/block_content.schema.yml
--- b/core/modules/block_content/config/schema/block_content.schema.yml
+++ b/core/modules/block_content/config/schema/block_content.schema.yml
@@ -4,24 +4,9 @@
-  type: mapping
+  type: config_entity
   label: 'Custom block type settings'
   mapping:
-    id:
-      type: string
-      label: 'Machine-readable name'
-    uuid:
-      type: string
-      label: 'UUID'
-    label:
-      type: label
-      label: 'Label'
     revision:
       type: integer
       label: 'Create new revision'
     description:
       type: text
       label: 'Description'
-    status:
-      type: boolean
-      label: 'Status'
-    langcode:
-      type: string
-      label: 'Default language'