diff --git a/jupyterhub/compose.yml b/jupyterhub/compose.yml
index 9fdd301..015d6c6 100644
--- a/jupyterhub/compose.yml
+++ b/jupyterhub/compose.yml
@@ -20,8 +20,8 @@ services:
   # speeds up first spawn dramatically
   base:
     image: jupyter/base-notebook:latest
-    entrypoint: ['echo hi']
+    entrypoint: ['echo']
 
   datasciene:
-    image: jupyter/datasciene-notebook:latest
-    entrypoint: ['echo hi']
+    image: jupyter/datascience-notebook:latest
+    entrypoint: ['echo']
diff --git a/jupyterhub/jupyterhub_config.py b/jupyterhub/jupyterhub_config.py
index e9ad8a7..3630b5a 100644
--- a/jupyterhub/jupyterhub_config.py
+++ b/jupyterhub/jupyterhub_config.py
@@ -159,6 +159,9 @@ c.JupyterHub.named_server_limit_per_user = 3
 
 
 # NBgrader
+
+nbgrader_exchange_dir = "/srv/nbgrader/exchange"
+
 """c.JupyterHub.services = [
     {
         "name": "nbgrader-formgrader",
@@ -185,7 +188,6 @@ c.JupyterHub.named_server_limit_per_user = 3
     }
 ]
 
-nbgrader_exchange_dir = "/srv/nbgrader/exchange"
 
 c.DockerSpawner.environment = {
     "JUPYTERHUB_API_TOKEN": "",  # Will be populated automatically