diff --git a/config/services/twig/component.xml b/config/services/twig/component.xml
index 6623518..917700f 100644
--- a/config/services/twig/component.xml
+++ b/config/services/twig/component.xml
@@ -11,7 +11,7 @@
             <argument type="service" id="form.factory" />
             <argument>%bitbag_sylius_blacklist_plugin.model.automatic_blacklisting_configuration.class%</argument>
             <argument>BitBag\SyliusBlacklistPlugin\Form\Type\AutomaticBlacklistingConfigurationType</argument>
-            <tag name="sylius.live_component.admin" key="sylius_admin:automatic_blacklisting_configuration:form" template="@BitBagSyliusBlacklistPlugin/AutomaticBlacklistingConfiguration/Admin/form.html.twig"/>
+            <tag name="sylius.live_component.admin" key="sylius_admin:automatic_blacklisting_configuration:form"/>
         </service>
 
         <service id="bitbag.sylius_blacklist_plugin.twig.component.blacklisting_rule.form" class="Sylius\Bundle\UiBundle\Twig\Component\ResourceFormComponent">
@@ -19,7 +19,7 @@
             <argument type="service" id="form.factory" />
             <argument>%bitbag_sylius_blacklist_plugin.model.blacklisting_rule.class%</argument>
             <argument>BitBag\SyliusBlacklistPlugin\Form\Type\BlacklistingRuleType</argument>
-            <tag name="sylius.live_component.admin" key="sylius_admin:blacklisting_rule:form" template="@BitBagSyliusBlacklistPlugin/BlacklistingRule/Admin/form.html.twig"/>
+            <tag name="sylius.live_component.admin" key="sylius_admin:blacklisting_rule:form"/>
         </service>
 
         <service id="bitbag.sylius_blacklist_plugin.twig.component.fraud_suspicion.form" class="Sylius\Bundle\UiBundle\Twig\Component\ResourceFormComponent">
@@ -27,7 +27,7 @@
             <argument type="service" id="form.factory" />
             <argument>%bitbag_sylius_blacklist_plugin.model.fraud_suspicion.class%</argument>
             <argument>BitBag\SyliusBlacklistPlugin\Form\Type\FraudSuspicionType</argument>
-            <tag name="sylius.live_component.admin" key="sylius_admin:fraud_suspicion:form" template="@BitBagSyliusBlacklistPlugin/FraudSuspicion/Admin/form.html.twig"/>
+            <tag name="sylius.live_component.admin" key="sylius_admin:fraud_suspicion:form"/>
         </service>
     </services>
 </container>
diff --git a/config/twig_hooks/automatic_blacklisting_configuration/create.yaml b/config/twig_hooks/automatic_blacklisting_configuration/create.yaml
index 6a5a3b2..abeab61 100644
--- a/config/twig_hooks/automatic_blacklisting_configuration/create.yaml
+++ b/config/twig_hooks/automatic_blacklisting_configuration/create.yaml
@@ -6,8 +6,6 @@ sylius_twig_hooks:
                 props:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
+                    template: '@BitBagSyliusBlacklistPlugin/AutomaticBlacklistingConfiguration/Admin/form.html.twig'
                 configuration:
                     render_rest: false
-        'sylius_admin.automatic_blacklisting_configuration.create.content.form':
-            sections:
-                template: '@BitBagSyliusBlacklistPlugin/AutomaticBlacklistingConfiguration/Admin/form.html.twig'
diff --git a/config/twig_hooks/automatic_blacklisting_configuration/update.yaml b/config/twig_hooks/automatic_blacklisting_configuration/update.yaml
index cc92bd4..2e7f379 100644
--- a/config/twig_hooks/automatic_blacklisting_configuration/update.yaml
+++ b/config/twig_hooks/automatic_blacklisting_configuration/update.yaml
@@ -6,8 +6,6 @@ sylius_twig_hooks:
                 props:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
+                    template: '@BitBagSyliusBlacklistPlugin/AutomaticBlacklistingConfiguration/Admin/form.html.twig'
                 configuration:
                     method: 'PUT'
-        'sylius_admin.automatic_blacklisting_configuration.update.content.form':
-            sections:
-                template: '@BitBagSyliusBlacklistPlugin/AutomaticBlacklistingConfiguration/Admin/form.html.twig'
diff --git a/config/twig_hooks/blacklisting_rule/create.yaml b/config/twig_hooks/blacklisting_rule/create.yaml
index 2c032d6..faa533e 100644
--- a/config/twig_hooks/blacklisting_rule/create.yaml
+++ b/config/twig_hooks/blacklisting_rule/create.yaml
@@ -6,8 +6,6 @@ sylius_twig_hooks:
                 props:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
+                    template: '@BitBagSyliusBlacklistPlugin/BlacklistingRule/Admin/form.html.twig'
                 configuration:
                     render_rest: false
-        'sylius_admin.blacklisting_rule.create.content.form':
-            sections:
-                template: '@BitBagSyliusBlacklistPlugin/BlacklistingRule/Admin/form.html.twig'
diff --git a/config/twig_hooks/blacklisting_rule/update.yaml b/config/twig_hooks/blacklisting_rule/update.yaml
index 6f765ac..923c2ef 100644
--- a/config/twig_hooks/blacklisting_rule/update.yaml
+++ b/config/twig_hooks/blacklisting_rule/update.yaml
@@ -6,8 +6,6 @@ sylius_twig_hooks:
                 props:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
+                    template: '@BitBagSyliusBlacklistPlugin/BlacklistingRule/Admin/form.html.twig'
                 configuration:
                     method: 'PUT'
-        'sylius_admin.blacklisting_rule.update.content.form':
-            sections:
-                template: '@BitBagSyliusBlacklistPlugin/BlacklistingRule/Admin/form.html.twig'
diff --git a/config/twig_hooks/fraud_suspicion/create.yaml b/config/twig_hooks/fraud_suspicion/create.yaml
index 38e877f..3d22930 100644
--- a/config/twig_hooks/fraud_suspicion/create.yaml
+++ b/config/twig_hooks/fraud_suspicion/create.yaml
@@ -6,8 +6,6 @@ sylius_twig_hooks:
                 props:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
+                    template: '@BitBagSyliusBlacklistPlugin/FraudSuspicion/Admin/form.html.twig'
                 configuration:
                     render_rest: false
-        'sylius_admin.fraud_suspicion.create.content.form':
-            sections:
-                template: '@BitBagSyliusBlacklistPlugin/FraudSuspicion/Admin/form.html.twig'
diff --git a/config/twig_hooks/fraud_suspicion/update.yaml b/config/twig_hooks/fraud_suspicion/update.yaml
index 3ea553f..fa80ad2 100644
--- a/config/twig_hooks/fraud_suspicion/update.yaml
+++ b/config/twig_hooks/fraud_suspicion/update.yaml
@@ -6,8 +6,6 @@ sylius_twig_hooks:
                 props:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
+                    template: '@BitBagSyliusBlacklistPlugin/FraudSuspicion/Admin/form.html.twig'
                 configuration:
                     method: 'PUT'
-        'sylius_admin.fraud_suspicion.update.content.form':
-            sections:
-                template: '@BitBagSyliusBlacklistPlugin/FraudSuspicion/Admin/form.html.twig'