diff --git a/composer.json b/composer.json
index 6d52fb0..e9a7dba 100644
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,7 @@
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
+            "drupal/core-composer-scaffold": false,
             "php-http/discovery": false,
             "phpstan/extension-installer": false,
             "tbachert/spi": false
diff --git a/src/Form/Layout/HorizontalLayoutArrayFactory.php b/src/Form/Layout/HorizontalLayoutArrayFactory.php
index 3820f50..4c71c86 100644
--- a/src/Form/Layout/HorizontalLayoutArrayFactory.php
+++ b/src/Form/Layout/HorizontalLayoutArrayFactory.php
@@ -32,7 +32,7 @@ public function supportsDefinition(DefinitionInterface $definition): bool {
 
   protected function createBasicFormArray(LayoutDefinition $definition): array {
     return [
-      '#type' => 'fieldset',
+      '#type' => 'container',
       '#attributes' => ['class' => ['container-inline']],
     ];
   }
diff --git a/src/Form/Layout/VerticalLayoutArrayFactory.php b/src/Form/Layout/VerticalLayoutArrayFactory.php
index 474d9fe..1b81b59 100644
--- a/src/Form/Layout/VerticalLayoutArrayFactory.php
+++ b/src/Form/Layout/VerticalLayoutArrayFactory.php
@@ -31,7 +31,7 @@ public function supportsDefinition(DefinitionInterface $definition): bool {
   }
 
   protected function createBasicFormArray(LayoutDefinition $definition): array {
-    return ['#type' => 'fieldset'];
+    return ['#type' => 'container'];
   }
 
 }