diff --git a/launcher.sh b/launcher.sh
index 937f10343a09c58777587e83af5caab2ff382d06..cc62d8d770d60d309c585f38198bbacddb04224f 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -131,17 +131,17 @@ case "$1" in
 	;;
 
 	"demokit")
-		init
-		monitor
-		campusmanager
-		mediaserver
-        # install celerity-worker
+        init
+        monitor
+        campusmanager
+        # install celerity-worker first so that vod test works
         python3 /root/envsetup/envsetup.py 72
+        mediaserver
         # install netcapture
         python3 /root/envsetup/envsetup.py 121
         # demokit scripts: deploy videos, custom conf, etc
         python3 /root/envsetup/envsetup.py 53
-		[[ $2 = "--skip-tests" ]] || tests
+        [[ $2 = "--skip-tests" ]] || tests
 	;;
 
 	"b")