diff --git a/composer.json b/composer.json
index 7e71452a84b79ed36cd1c6924a3e8df11fef8f75..7ebaa928da0150d426a734495601c853a3242029 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "drupal/cer": "^5.0",
         "drupal/config_rewrite": "^1.0",
         "drupal/content_model_documentation": "^1.0",
-        "drupal/custom_field": "3.0.3",
+        "drupal/custom_field": "^3.0",
         "drupal/devel": "^5.0",
         "drupal/embed": "^1.0",
         "drupal/entity_browser": "^2.0",
diff --git a/composer.libraries.json b/composer.libraries.json
index 39c5c3f4b272b11e45a268d432841f8dbaa927e4..48824053c58983d926854e2a01b931ca131466c1 100644
--- a/composer.libraries.json
+++ b/composer.libraries.json
@@ -24,7 +24,7 @@
     "drupal/cer": "^5.0",
     "drupal/config_rewrite": "^1.0",
     "drupal/content_model_documentation": "^1.0",
-    "drupal/custom_field": "3.0.3",
+    "drupal/custom_field": "^3.0",
     "drupal/embed": "^1.0",
     "drupal/entity_browser": "^2.0",
     "drupal/entity_embed": "^1.0",
diff --git a/modules/schemadotorg_custom_field/src/SchemaDotOrgCustomFieldManager.php b/modules/schemadotorg_custom_field/src/SchemaDotOrgCustomFieldManager.php
index 3d6743ceec2071a79723f3f9437d9c37f2f168f3..b5cab9fd0eedc8bfd90b9dbff0d29e992ed0ae4b 100644
--- a/modules/schemadotorg_custom_field/src/SchemaDotOrgCustomFieldManager.php
+++ b/modules/schemadotorg_custom_field/src/SchemaDotOrgCustomFieldManager.php
@@ -250,6 +250,14 @@ class SchemaDotOrgCustomFieldManager implements SchemaDotOrgCustomFieldManagerIn
       if (!empty($field_settings[$name]['widget_settings']['settings']['prefix'])
         || !empty($field_settings[$name]['widget_settings']['settings']['suffix'])) {
         $formatter_settings['fields'][$name]['format_type'] = $field_type->getDefaultFormatter();
+        $formatter_settings['fields'][$name]['wrappers'] = [
+          'field_wrapper_tag' => '',
+          'field_wrapper_classes' => '',
+          'field_tag' => '',
+          'field_classes' => '',
+          'label_tag' => '',
+          'label_classes' => '',
+        ];
         $formatter_settings['fields'][$name]['formatter_settings']['prefix_suffix'] = TRUE;
       }
 
diff --git a/modules/schemadotorg_custom_field/tests/src/Functional/SchemaDotOrgCustomFieldBuilderTest.php b/modules/schemadotorg_custom_field/tests/src/Functional/SchemaDotOrgCustomFieldBuilderTest.php
index 60d9cf5576283b9994d564a001b78438f08153fe..d4094f3aae4558763e71b429eafaa8a35b8a29f6 100644
--- a/modules/schemadotorg_custom_field/tests/src/Functional/SchemaDotOrgCustomFieldBuilderTest.php
+++ b/modules/schemadotorg_custom_field/tests/src/Functional/SchemaDotOrgCustomFieldBuilderTest.php
@@ -54,7 +54,7 @@ class SchemaDotOrgCustomFieldBuilderTest extends SchemaDotOrgBrowserTestBase {
     $this->submitForm($edit, 'Save');
 
     $assert->responseContains('<title>Some recipe | Drupal</title>');
-    $assert->responseContains('<div class="field__label ">Calories</div>');
+    $assert->responseContains('<div class="field__label">Calories</div>');
     $assert->responseContains('<div class="field__item">10 calories</div>');
   }
 
diff --git a/modules/schemadotorg_custom_field/tests/src/Kernel/SchemaDotOrgCustomFieldManagerKernelTest.php b/modules/schemadotorg_custom_field/tests/src/Kernel/SchemaDotOrgCustomFieldManagerKernelTest.php
index 5b7dfb7b43a12c7a016ea5895d53a8ecd02e1a9e..fd4f85ef7dbca85537f514b6fb62bf5c94d87b6e 100644
--- a/modules/schemadotorg_custom_field/tests/src/Kernel/SchemaDotOrgCustomFieldManagerKernelTest.php
+++ b/modules/schemadotorg_custom_field/tests/src/Kernel/SchemaDotOrgCustomFieldManagerKernelTest.php
@@ -240,6 +240,19 @@ class SchemaDotOrgCustomFieldManagerKernelTest extends SchemaDotOrgEntityKernelT
     /** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $entity_form_display */
     $entity_view_display = EntityViewDisplay::load('node.recipe.default');
     $components = $entity_view_display->getComponents();
+    $component_defaults = [
+      'wrappers' => [
+        'field_wrapper_tag' => '',
+        'field_wrapper_classes' => '',
+        'field_tag' => '',
+        'field_classes' => '',
+        'label_tag' => '',
+        'label_classes' => '',
+      ],
+      'formatter_settings' => [
+        'prefix_suffix' => TRUE,
+      ],
+    ];
     $expected_component = [
       'type' => 'custom_formatter',
       'label' => 'above',
@@ -247,68 +260,37 @@ class SchemaDotOrgCustomFieldManagerKernelTest extends SchemaDotOrgEntityKernelT
         'fields' => [
           'calories' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => ['prefix_suffix' => TRUE],
-          ],
+          ] + $component_defaults,
           'carbohydrate_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'cholesterol_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'fat_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'fiber_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'protein_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'saturated_fat_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'sodium_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'sugar_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'trans_fat_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
           'unsaturated_fat_content' => [
             'format_type' => 'number_integer',
-            'formatter_settings' => [
-              'prefix_suffix' => TRUE,
-            ],
-          ],
+          ] + $component_defaults,
         ],
       ],
       'third_party_settings' => [],