diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
index 47d80f40d..2462f0990 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
@@ -9,24 +9,27 @@ declare(strict_types=1);
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use ChampsLibres\WopiLib\WopiInterface;
-use ChampsLibres\WopiTestBundle\Service\Wopi;
+use OpenStack\OpenStack;
 
 return static function (ContainerConfigurator $container) {
-    $services = $container->services();
+    $services = $container
+        ->services();
 
     $services
         ->defaults()
-        ->autoconfigure(true)
-        ->autowire(true);
+        ->autowire()
+        ->autoconfigure();
 
     $services
-        ->load('ChampsLibres\\WopiTestBundle\\Service\\', __DIR__ . '/../../Service');
+        ->load('Chill\\WopiBundle\\', '../*')
+        ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}');
 
     $services
-        ->load('ChampsLibres\\WopiTestBundle\\Controller\\', __DIR__ . '/../../Controller')
+        ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller')
         ->tag('controller.service_arguments');
 
     $services
-        ->alias(WopiInterface::class, Wopi::class);
+        ->set('chill_wopi.openstack_client')
+        ->class(OpenStack::class)
+        ->arg('$options', '%chill_wopi.openstack%');
 };
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/services.php b/src/Bundle/ChillWopiBundle/src/Resources/services.php
deleted file mode 100644
index 2462f0990..000000000
--- a/src/Bundle/ChillWopiBundle/src/Resources/services.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use OpenStack\OpenStack;
-
-return static function (ContainerConfigurator $container) {
-    $services = $container
-        ->services();
-
-    $services
-        ->defaults()
-        ->autowire()
-        ->autoconfigure();
-
-    $services
-        ->load('Chill\\WopiBundle\\', '../*')
-        ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}');
-
-    $services
-        ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller')
-        ->tag('controller.service_arguments');
-
-    $services
-        ->set('chill_wopi.openstack_client')
-        ->class(OpenStack::class)
-        ->arg('$options', '%chill_wopi.openstack%');
-};