diff --git a/tljh/jupyterhub_config.py b/tljh/jupyterhub_config.py
index e3a9a69..9abb4c5 100644
--- a/tljh/jupyterhub_config.py
+++ b/tljh/jupyterhub_config.py
@@ -34,5 +34,7 @@ c.ConfigurableHTTPProxy.api_url = 'http://127.0.0.1:15002'
 
 c.SystemdSpawner.extra_paths = [os.path.join(USER_ENV_PREFIX, 'bin')]
 c.SystemdSpawner.default_shell = '/bin/bash'
+# Drop the '-singleuser' suffix present in the default template
+c.SystemdSpawner.unit_name_template = 'jupyter-{USERNAME}'
 
 configurer.apply_yaml_config(os.path.join(INSTALL_PREFIX, 'config.yaml'), c)