diff --git a/tools/ccp-multi-deploy/ccp-multi-deploy.sh b/tools/ccp-multi-deploy/ccp-multi-deploy.sh
index 4e0fbef1..5c8bc35f 100755
--- a/tools/ccp-multi-deploy/ccp-multi-deploy.sh
+++ b/tools/ccp-multi-deploy/ccp-multi-deploy.sh
@@ -31,8 +31,8 @@ Options:
         (rely on existing local registry, default: false)
 -v, --openstack-version=VERSION
         set openstack version newton or master (default: master)
--d, --debug-std
-        print debug logs to standard output
+-d, --debug
+        create diagnostic snapshot if deployment fails
 EOF
     exit
 }
@@ -43,13 +43,10 @@ function ccp_wait_for_deployment_to_finish {
         echo "Waiting for OpenStack deployment to finish..."
         sleep 5
         cnt=$((cnt + 1))
-        if [ ${cnt} -eq 180 ]; then
+        if [ ${cnt} -eq 300 ]; then
             echo "Max time exceeded"
-            if [ -n "${PRINT_STD}" ]; then
-                for f in `kubectl --namespace $1 get pod | grep -v -E '(Running|ContainerCreating|Pending)' | awk {'print $1'} | tail -n +2`; do
-                    echo "-------------- ${f} ---------------"
-                    kubectl --namespace "${1}" logs "${f}"
-                done
+            if [ -n "${DEBUG}" ]; then
+                ./tools/diagnostic-snapshot.sh -n "${1}"
             fi
             exit 1
         fi
@@ -76,7 +73,7 @@ function run_openstack_tests {
 
 
 # Parse command line arguments:
-OPTS=`getopt -o 'hdsn:v:' --long help,debug-std,skip-building-images,number-of-envs:,openstack-version: -n 'parse-options' -- ${@}`
+OPTS=`getopt -o 'hdsn:v:' --long help,debug,skip-building-images,number-of-envs:,openstack-version: -n 'parse-options' -- ${@}`
 if [ ${?} != 0 ] ; then
     echo "Failed parsing options."
     exit 1
@@ -89,7 +86,7 @@ while true; do
         -n|--number-of-envs ) NUMBER_OF_ENVS=${2}; shift; shift ;;
         -s|--skip-building-images ) BUILD_IMAGES=false; shift ;;
         -v|--openstack-version ) VERSION="${2}"; NAMESPACE_PREFIX="ccp-${2}"; shift; shift ;;
-        -d|--debug-std ) PRINT_STD="yes"; shift ;;
+        -d|--debug ) DEBUG="yes"; shift ;;
         -- ) shift; break ;;
         * ) break ;;
     esac