diff --git a/services/scripts/run_all_services.sh b/services/scripts/run_all_services.sh
index bb6a51601..41b9741e9 100755
--- a/services/scripts/run_all_services.sh
+++ b/services/scripts/run_all_services.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 
 set -e
 
 . ./scripts/services_config.sh
 
 echo "tunnelbroker service will run at port ${COMM_SERVICES_PORT_TUNNELBROKER}"
 echo "backup service will run at port ${COMM_SERVICES_PORT_BACKUP}"
 echo "blob service will run at port ${COMM_SERVICES_PORT_BLOB}"
 
+SERVICES_LIST=`./scripts/list_services.sh`
+SERVICES=""
+for SERVICE in $SERVICES_LIST; do
+  SERVICES="$SERVICES $SERVICE-server"
+done
 
-docker-compose build tunnelbroker-server
-docker-compose build backup-server
-docker-compose build blob-server
-
-docker-compose up
+docker-compose up $SERVICES