cdn.services.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cdn.services.yml b/cdn.services.yml
index c12756d..1ad387b 100644
--- a/cdn.services.yml
+++ b/cdn.services.yml
@@ -1,11 +1,10 @@
 services:
-  cdn.settings:
-    class: Drupal\cdn\CdnSettings
+  Drupal\cdn\CdnSettings:
     arguments: ['@config.factory']
 
   cdn.file_url_generator:
     class: Drupal\cdn\File\FileUrlGenerator
-    arguments: ['%app.root%', '@stream_wrapper_manager', '@request_stack', '@private_key', '@cdn.settings']
+    arguments: ['%app.root%', '@stream_wrapper_manager', '@request_stack', '@private_key', '@Drupal\cdn\CdnSettings']
 
   # Event subscribers.
   cdn.config_subscriber:
@@ -15,7 +14,7 @@ services:
       - { name: event_subscriber }
   cdn.html_response_subscriber:
     class: Drupal\cdn\EventSubscriber\HtmlResponseSubscriber
-    arguments: ['@cdn.settings']
+    autowire: true
     tags:
       - { name: event_subscriber }