diff --git a/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/blackbox.yml b/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/blackbox.yml
index 8843d34b..d222115d 100644
--- a/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/blackbox.yml
+++ b/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/blackbox.yml
@@ -3,6 +3,6 @@ parameters:
 
 services:
   drupal.driver.blackbox:
-    class: %drupal.driver.blackbox.class%
+    class: "%drupal.driver.blackbox.class%"
     tags:
       - { name: drupal.driver, alias: blackbox }
diff --git a/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drupal.yml b/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drupal.yml
index abe243d7..d26918c9 100644
--- a/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drupal.yml
+++ b/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drupal.yml
@@ -11,36 +11,36 @@ parameters:
 
 services:
   drupal.driver.random:
-    class: %drupal.random.class%
+    class: "%drupal.random.class%"
   drupal.driver.drupal:
-    class: %drupal.driver.drupal.class%
+    class: "%drupal.driver.drupal.class%"
     arguments:
-      - %drupal.driver.drupal.drupal_root%
-      - %mink.base_url%
+      - "%drupal.driver.drupal.drupal_root%"
+      - "%mink.base_url%"
       - "@drupal.driver.random"
     tags:
       - { name: drupal.driver, alias: drupal }
   drupal.driver.cores.6:
-    class: %drupal.driver.cores.6.class%
+    class: "%drupal.driver.cores.6.class%"
     tags:
       - { name: drupal.core, alias: 6 }
     arguments:
-      - %drupal.driver.drupal.drupal_root%
-      - %mink.base_url%
+      - "%drupal.driver.drupal.drupal_root%"
+      - "%mink.base_url%"
       - "@drupal.driver.random"
   drupal.driver.cores.7:
-    class: %drupal.driver.cores.7.class%
+    class: "%drupal.driver.cores.7.class%"
     tags:
       - { name: drupal.core, alias: 7 }
     arguments:
-      - %drupal.driver.drupal.drupal_root%
-      - %mink.base_url%
+      - "%drupal.driver.drupal.drupal_root%"
+      - "%mink.base_url%"
       - "@drupal.driver.random"
   drupal.driver.cores.8:
-    class: %drupal.driver.cores.8.class%
+    class: "%drupal.driver.cores.8.class%"
     tags:
       - { name: drupal.core, alias: 8 }
     arguments:
-      - %drupal.driver.drupal.drupal_root%
-      - %mink.base_url%
+      - "%drupal.driver.drupal.drupal_root%"
+      - "%mink.base_url%"
       - "@drupal.driver.random"
diff --git a/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drush.yml b/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drush.yml
index 26bf173a..87dc8d1b 100644
--- a/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drush.yml
+++ b/src/Drupal/DrupalExtension/ServiceContainer/config/drivers/drush.yml
@@ -6,13 +6,13 @@ parameters:
 
 services:
   drupal.driver.random:
-    class: %drupal.random.class%
+    class: "%drupal.random.class%"
   drupal.driver.drush:
-    class: %drupal.driver.drush.class%
+    class: "%drupal.driver.drush.class%"
     arguments:
-      - %drupal.driver.drush.alias%
-      - %drupal.driver.drush.root%
-      - %drupal.driver.drush.binary%
+      - "%drupal.driver.drush.alias%"
+      - "%drupal.driver.drush.root%"
+      - "%drupal.driver.drush.binary%"
       - "@drupal.driver.random"
     tags:
       - { name: drupal.driver, alias: drush }
diff --git a/src/Drupal/DrupalExtension/ServiceContainer/config/services.yml b/src/Drupal/DrupalExtension/ServiceContainer/config/services.yml
index cff335e4..fccd8c89 100644
--- a/src/Drupal/DrupalExtension/ServiceContainer/config/services.yml
+++ b/src/Drupal/DrupalExtension/ServiceContainer/config/services.yml
@@ -34,47 +34,47 @@ parameters:
 
 services:
   drupal.drupal:
-    class: %drupal.drupal.class%
+    class: "%drupal.drupal.class%"
     arguments:
       - {}
       - "@drupal.random"
   drupal.user_manager:
-    class: %drupal.user_manager.class%
+    class: "%drupal.user_manager.class%"
   drupal.random:
-    class: %drupal.random.class%
+    class: "%drupal.random.class%"
   drupal.context.initializer:
-    class: %drupal.context.initializer.class%
+    class: "%drupal.context.initializer.class%"
     arguments:
       - "@drupal.drupal"
-      - %drupal.parameters%
+      - "%drupal.parameters%"
       - "@hook.dispatcher"
       - "@drupal.user_manager"
     tags:
       - { name: context.initializer }
   drupal.context.environment.reader:
-    class: %drupal.context.environment.reader.class%
+    class: "%drupal.context.environment.reader.class%"
     arguments:
       - "@drupal.drupal"
-      - %drupal.parameters%
+      - "%drupal.parameters%"
     tags:
       - { name: environment.reader }
   drupal.context.loader.annotated:
-    class: %drupal.context.annotation.reader.class%
+    class: "%drupal.context.annotation.reader.class%"
     arguments:
     tags:
       - { name: context.annotation_reader }
   drupal.listener.driver:
-    class: %drupal.listener.drivers.class%
+    class: "%drupal.listener.drivers.class%"
     arguments:
       - "@drupal.drupal"
-      - %drupal.parameters%
+      - "%drupal.parameters%"
     tags:
       - { name: event_dispatcher.subscriber, priority: 0 }
   drupal.region_selector:
-    class: %drupal.context.region_selector.class%
+    class: "%drupal.context.region_selector.class%"
     arguments:
       # inject the CSSSelector
       - "@mink.selector.css"
-      - %drupal.region_map%
+      - "%drupal.region_map%"
     tags:
       - { name: mink.selector, alias: region }