diff --git a/terminalserver/files/after-network.conf b/terminalserver/files/after-network.conf
new file mode 100644
index 0000000000000000000000000000000000000000..6f45f4effed837b571c636fea18ae2dd923972b2
--- /dev/null
+++ b/terminalserver/files/after-network.conf
@@ -0,0 +1,2 @@
+[Unit]
+After=network.target
diff --git a/terminalserver/handlers/main.yml b/terminalserver/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5ed7f98630bd8f4a44dc780a918558c2a7c566a8
--- /dev/null
+++ b/terminalserver/handlers/main.yml
@@ -0,0 +1,5 @@
+- name: Reload systemd
+  systemd: daemon-reload=yes
+
+- name: Restart cron
+  systemd: name=cron state=restarted
diff --git a/terminalserver/tasks/main.yml b/terminalserver/tasks/main.yml
index a625407c7c9f55484c1ae73244cceea4f2d6fd95..209793a40ee891c328b8dd72a2086e30c364c648 100644
--- a/terminalserver/tasks/main.yml
+++ b/terminalserver/tasks/main.yml
@@ -10,5 +10,24 @@
   tags:
     - packages
 
+- name: Ensure presence of cron.service.d
+  file:
+    path: /etc/systemd/system/cron.service.d
+    state: directory
+  tags:
+    - config
+    - cron
+
+- name: Ensure crond starts after network is available
+  copy:
+    dest: /etc/systemd/system/cron.service.d/after-network.conf
+    src: after-network.conf
+  notify:
+    - Reload systemd
+    - Restart cron
+  tags:
+    - config
+    - cron
+
 - include: x2go.yml
 - meta: flush_handlers