diff --git a/tljh/systemd-units/configurable-http-proxy.service b/tljh/systemd-units/configurable-http-proxy.service
index 772cd79..d05976d 100644
--- a/tljh/systemd-units/configurable-http-proxy.service
+++ b/tljh/systemd-units/configurable-http-proxy.service
@@ -1,7 +1,8 @@
 # Template file for Configurable HTTP Proxy systemd service
 # Uses simple string.format() for 'templating'
 [Unit]
-Wants=network-online.target
+# Wait for network stack to be fully up before starting CHP
+After=network.target
 
 [Service]
 User=root
diff --git a/tljh/systemd-units/jupyterhub.service b/tljh/systemd-units/jupyterhub.service
index 525b74b..f635bfd 100644
--- a/tljh/systemd-units/jupyterhub.service
+++ b/tljh/systemd-units/jupyterhub.service
@@ -1,7 +1,9 @@
 # Template file for JupyterHub systemd service
 # Uses simple string.format() for 'templating'
 [Unit]
-Wants=configurable-http-proxy.service
+# CHP must have successfully started *before* we launch JupyterHub
+Requires=configurable-http-proxy.service
+After=configurable-http-proxy.service
 
 [Service]
 User=root