diff --git a/config/schema/payment.schema.yml b/config/schema/payment.schema.yml
index b3a9f5b..cdc1e32 100644
--- a/config/schema/payment.schema.yml
+++ b/config/schema/payment.schema.yml
@@ -17,12 +17,6 @@ payment.payment_method_configuration.*:
     pluginId:
       type: string
       label: Plugin ID
-    status:
-      type: boolean
-      label: Status
-    uuid:
-      type: string
-      label: UUID
 
 payment.payment_status.*:
   type: config_entity
diff --git a/modules/payment_form/config/schema/payment_form.schema.yml b/modules/payment_form/config/schema/payment_form.schema.yml
index aeb374b..a4399f7 100644
--- a/modules/payment_form/config/schema/payment_form.schema.yml
+++ b/modules/payment_form/config/schema/payment_form.schema.yml
@@ -1,5 +1,6 @@
 payment_form.payment_type:
   label: Payment Form configuration
+  type: config_entity
   mapping:
     allowed_plugin_ids:
       label: Allowed payment method plugin IDs
@@ -16,7 +17,6 @@ payment_form.payment_type:
     plugin_selector_configuration:
       label: Plugin selector configuration
       type: plugin.plugin_configuration.selector.[%parent.plugin_selector_id]
-  type: mapping
 
 plugin.plugin_configuration.payment_type.payment_form:
   label: Payment Form payment type configuration
@@ -36,7 +36,7 @@ plugin.plugin_configuration.payment_type.payment_form:
   type: mapping
 
 field.field_settings.payment_form:
-  type: mapping
+  type: config_entity
   label: Payment form field settings
   mapping:
     currency_code: