diff --git a/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.php b/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.php
deleted file mode 100644
index 7ff6ab19..00000000
--- a/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-use MsgPhp\Eav\Attribute;
-use MsgPhp\Eav\AttributeValue;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return function (ContainerConfigurator $container) {
-    $container->extension('msgphp_eav', [
-        'class_mapping' => [
-            Attribute::class => \App\Entity\Attribute::class,
-            AttributeValue::class => \App\Entity\AttributeValue::class,
-        ],
-    ]);
-};
diff --git a/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.yaml b/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.yaml
new file mode 100644
index 00000000..ff6648c9
--- /dev/null
+++ b/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.yaml
@@ -0,0 +1,4 @@
+msgphp_eav:
+    class_mapping:
+        MsgPhp\Eav\Attribute: App\Entity\Attribute
+        MsgPhp\Eav\AttributeValue: App\Entity\AttributeValue
diff --git a/msgphp/user-bundle/0.10/config/packages/msgphp_user.php b/msgphp/user-bundle/0.10/config/packages/msgphp_user.php
deleted file mode 100644
index 44770919..00000000
--- a/msgphp/user-bundle/0.10/config/packages/msgphp_user.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-use MsgPhp\User\User;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return function (ContainerConfigurator $container) {
-    $container->extension('msgphp_user', [
-        'class_mapping' => [
-            User::class => \App\Entity\User::class,
-        ],
-    ]);
-};
diff --git a/msgphp/user-bundle/0.10/config/packages/msgphp_user.yaml b/msgphp/user-bundle/0.10/config/packages/msgphp_user.yaml
new file mode 100644
index 00000000..fe7238ff
--- /dev/null
+++ b/msgphp/user-bundle/0.10/config/packages/msgphp_user.yaml
@@ -0,0 +1,3 @@
+msgphp_user:
+    class_mapping:
+        MsgPhp\User\User: App\Entity\User
diff --git a/web-auth/webauthn-symfony-bundle/3.0/config/routes/webauthn_routes.php b/web-auth/webauthn-symfony-bundle/3.0/config/routes/webauthn_routes.php
deleted file mode 100644
index f8355132..00000000
--- a/web-auth/webauthn-symfony-bundle/3.0/config/routes/webauthn_routes.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
-
-return function (RoutingConfigurator $routes) {
-    $routes->import('.', 'webauthn');
-};
diff --git a/web-auth/webauthn-symfony-bundle/3.0/config/routes/webauthn_routes.yaml b/web-auth/webauthn-symfony-bundle/3.0/config/routes/webauthn_routes.yaml
new file mode 100644
index 00000000..fa3e8e9a
--- /dev/null
+++ b/web-auth/webauthn-symfony-bundle/3.0/config/routes/webauthn_routes.yaml
@@ -0,0 +1,3 @@
+webauthn_routes:
+    resource: .
+    type: webauthn