diff --git a/setup.py b/setup.py
index e1bb699..f73290c 100644
--- a/setup.py
+++ b/setup.py
@@ -19,12 +19,8 @@ setup(
         'requests',
         'bcrypt',
         'jupyterhub-traefik-proxy==0.2.*',
-        'jupyterhub-configurator @ git+https://github.com/yuvipanda/jupyterhub-configurator@ecca97e016e9a939dd48c6c0e66c40e4e2951fa7',
     ],
     entry_points={
-        'jupyterhub_configurator': [
-            'schema = tljh.schemas.tljh_configurator',
-        ],
         'console_scripts': [
             'tljh-config = tljh.config:main',
         ]
diff --git a/tljh/installer.py b/tljh/installer.py
index 8c89ccf..cfbbeda 100644
--- a/tljh/installer.py
+++ b/tljh/installer.py
@@ -141,6 +141,7 @@ def ensure_jupyterhub_package(prefix):
             "oauthenticator==0.10.0",
             "jupyterhub-idle-culler==1.0",
             "chardet==3.0.4",
+            "git+https://github.com/yuvipanda/jupyterhub-configurator@317759e17c8e48de1b1352b836dac2a230536dba"
         ],
     )
     traefik.ensure_traefik_binary(prefix)
diff --git a/tljh/schemas/__init__.py b/tljh/schemas/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tljh/schemas/tljh_configurator.py b/tljh/schemas/tljh_configurator.py
deleted file mode 100644
index abd0335..0000000
--- a/tljh/schemas/tljh_configurator.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from jupyterhub_configurator.hooks import hookimpl
-
-@hookimpl
-def jupyterhub_configurator_fields():
-    return {
-        "schema.default_interface": {
-            "type": "string",
-            "traitlet": "Spawner.default_url",
-            "title": "Default User Interface",
-            "enum": ["/tree", "/lab", "/nteract"],
-            "default": "/tree",
-            "enumMetadata": {
-                "/tree": {
-                    "title": "Classic Notebook",
-                    "description": "The original single-document interface for creating Jupyter Notebooks.",
-                },
-                "/lab": {
-                    "title": "JupyterLab",
-                    "description": "A Powerful next generation notebook interface",
-                },
-                "/nteract": {
-                    "title": "Nteract",
-                    "description": "Nteract notebook interface",
-                },
-            },
-        }
-    }
diff --git a/tljh/user_creating_spawner.py b/tljh/user_creating_spawner.py
index f05cf0e..14307f0 100755
--- a/tljh/user_creating_spawner.py
+++ b/tljh/user_creating_spawner.py
@@ -3,6 +3,7 @@ from tljh import user
 from tljh import configurer
 from systemdspawner import SystemdSpawner
 from traitlets import Dict, Unicode, List
+from jupyterhub_configurator.mixins import ConfiguratorSpawnerMixin
 
 class CustomSpawner(SystemdSpawner):
     """