diff --git a/server-ce/bin/compile-services b/server-ce/bin/compile-services
new file mode 100755
index 0000000000..3114df405d
--- /dev/null
+++ b/server-ce/bin/compile-services
@@ -0,0 +1,23 @@
+#! env bash
+
+set -ex
+
+grep 'name:' config/services.js | \
+	sed 's/.*name: "\(.*\)",/\1/' | \
+	while read service
+	do
+		pushd $service
+		echo "Compiling Service $service"
+		case $service in 
+			web)
+				make compile_full
+				;;
+			chat)
+				echo "$service doesn't require a compilation"
+				;;	
+			*)
+				npm run compile:all
+				;;
+		esac	
+		popd
+	done
diff --git a/server-ce/bin/install-services b/server-ce/bin/install-services
old mode 100644
new mode 100755
index 3f1e5dd44b..b5a1711102
--- a/server-ce/bin/install-services
+++ b/server-ce/bin/install-services
@@ -1,25 +1,16 @@
 #! env bash
 
-[ -z "`type -t nvm`" ] && cat <<EOF
-
-==========================================================
-== NVM not installed, you should consider installing it ==
-==========================================================
-
-EOF
-
+set -ex
 
 grep 'name:' config/services.js | \
 	sed 's/.*name: "\(.*\)",/\1/' | \
 	while read service
 	do
 		pushd $service
-		echo "Installing Service $service"
-		echo '  installing Node'
-		type -t nvm && nvm install
-		type -t nvm && nvm use
-		echo '  installing Dependencies'
-		npm install
-		grunt install
+		echo "Installing Node from .nvmrc"
+		nvm install && nvm use
+		echo "Installing service $service"
+		npm install --quiet
 		popd
 	done
+