diff --git a/Configuration/Yaml/SaveRepeatableToDatabaseFormEditorSetup.yaml b/Configuration/Yaml/SaveRepeatableToDatabaseFormEditorSetup.yaml
index b70e4ab..28a7f37 100644
--- a/Configuration/Yaml/SaveRepeatableToDatabaseFormEditorSetup.yaml
+++ b/Configuration/Yaml/SaveRepeatableToDatabaseFormEditorSetup.yaml
@@ -7,7 +7,7 @@ TYPO3:
             SaveRepeatableToDatabase:
               formEditor:
                 label: 'Save repeatable into database'
-                iconIdentifier: 't3-form-icon-finisher'
+                iconIdentifier: form-finisher
           formElementsDefinition:
             Form:
               formEditor:
@@ -23,7 +23,10 @@ TYPO3:
                     1576505658:
                       identifier: 'SaveRepeatableToDatabase'
                       editors:
-                        __inheritances:
-                          10: 'TYPO3.CMS.Form.mixins.formElementMixins.BaseCollectionEditorsMixin'
                         100:
+                          identifier: header
+                          templateName: Inspector-CollectionElementHeaderEditor
                           label: 'Save repeatable into database'
+                        9999:
+                          identifier: removeButton
+                          templateName: Inspector-RemoveElementEditor
diff --git a/composer.json b/composer.json
index 9652b46..40ec80f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,9 +17,9 @@
         }
     ],
     "require": {
-        "typo3/cms-core": "^8.7.0 || ^9.5.0",
-        "typo3/cms-form": "^8.7.0 || ^9.5.0",
-        "php": ">=7.2.0 <7.4.99"
+        "typo3/cms-core": "^8.7.0 || ^9.5.0 || ^10.4.0 || ^11.5.0",
+        "typo3/cms-form": "^8.7.0 || ^9.5.0 || ^10.4.0 || ^11.5.0",
+        "php": ">=7.2.0 <7.4.99 || >8.0.0"
     },
     "suggest": {
         "tritum/repeatable-form-elements": "You may want the repeatable container from TRITUM"
diff --git a/ext_typoscript_setup.typoscript b/ext_typoscript_setup.typoscript
index eeee850..f84e930 100644
--- a/ext_typoscript_setup.typoscript
+++ b/ext_typoscript_setup.typoscript
@@ -1,6 +1,7 @@
 // The configurations in the registered file are meant for the Form Editor module.
 module.tx_form.settings.yamlConfigurations {
     234 = EXT:em_form_repeatablesave/Configuration/Yaml/SaveRepeatableToDatabaseFormEditorSetup.yaml
+    235 = EXT:em_form_repeatablesave/Configuration/Yaml/SaveRepeatableToDatabaseFormEngineSetup.yaml
 }
 
 // The configurations in the registered file are meant for the frontend plugin