diff --git a/cli/src/core/service_creator.py b/cli/src/core/service_creator.py
index d03dab8..cc10e5b 100644
--- a/cli/src/core/service_creator.py
+++ b/cli/src/core/service_creator.py
@@ -158,7 +158,8 @@ class ServiceCreator:
         with open(MASTER_IOC_SUBS_FILE) as f:
             file_content = f.read()
 
-        new_row = f'          {{ "{{{{ agebd_env }}}}",     "{service_name:<20}" , "{starton}",     "{autooff}"     }}'
+        quoted_service = f'"{service_name}"'
+        new_row = f'          {{ "{{{{ agebd_env }}}}",     {quoted_service:<22} , "{starton}",     "{autooff}"     }}'
 
         # Use regex to find the last closing curly brace of the configuration block
         # This targets the line that contains only a lone closing brace, optional spaces, and maybe a comma/semicolon.