diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml
index 08a4ceac3e3134bb5e6ebe6557426e2565e4bd04..0b925a6461078c3ee40b81ec4c287c6e1424a092 100644
--- a/cesnet-central/deployments/fullhub.yaml
+++ b/cesnet-central/deployments/fullhub.yaml
@@ -79,14 +79,31 @@ singleuser:
         args:
           - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
         image: "valtri/single-user:jupyter-4e-collab"
-  #
-  # Dirty hack to make remote mount working properly:
-  #
-  # 1) wait for webdav sidecar image to kick in
-  # 2) change directory to the mounted version of itself
-  # 3) launch notebook server
-  #
-  cmd: [ "/bin/sh", "-c", "i=0; while ! grep '^webdav-fs: /home/jovyan ' /proc/mounts && test $i -lt 30; do echo 'Waiting for ownClound mount...'; sleep 0.5; i=$((i+1)); done; cd .; jupyterhub-singleuser" ]
+  cmd: jupyterhub-singleuser-webdav-wrapper
+  extraFiles:
+    wait-owncloud.sh:
+      mode: 0755
+      mountPath: /usr/local/bin/jupyterhub-singleuser-webdav-wrapper
+      stringData: |-
+        #! /bin/sh
+
+        #
+        # Dirty hack to make remote mount on home directory working properly:
+        #
+        # 1) wait for webdav sidecar image to kick in
+        # 2) change directory to the mounted version of itself
+        # 3) launch notebook server
+        #
+        i=0
+        while ! grep '^webdav-fs: /home/jovyan ' /proc/mounts && test $i -lt 30; do
+          echo 'Waiting for ownClound mount...'
+          sleep 0.5
+          i=$((i+1))
+        done
+
+        cd .
+
+        exec jupyterhub-singleuser "$@"
 
 hub:
   services: