diff --git a/test_framework/scripts/download-support-bundle.sh b/test_framework/scripts/download-support-bundle.sh
index 05932d401f..994d3b1f1c 100755
--- a/test_framework/scripts/download-support-bundle.sh
+++ b/test_framework/scripts/download-support-bundle.sh
@@ -1,30 +1,53 @@
 #!/usr/bin/env bash
 
-set -ex
+set -x
 
 source test_framework/scripts/kubeconfig.sh
 
 SUPPORT_BUNDLE_FILE_NAME=${1:-"lh-support-bundle.zip"}
-SUPPORT_BUNDLE_ISSUE_URL=${2:-""}
-SUPPORT_BUNDLE_ISSUE_DESC=${3:-"Auto-generated support buundle"}
+SUPPORT_BUNDLE_ISSUE_DESC=${3:-"Auto-generated support bundle"}
 
 set_kubeconfig
 
-LH_FRONTEND_ADDR=`kubectl get svc -n longhorn-system longhorn-frontend -o json | jq -r '.spec.clusterIP + ":" + (.spec.ports[0].port|tostring)'`
-
-JSON_PAYLOAD="{\"issueURL\": \"${SUPPORT_BUNDLE_ISSUE_DESC}\", \"description\": \"${SUPPORT_BUNDLE_ISSUE_DESC}\"}"
-
-CURL_CMD="curl -XPOST http://${LH_FRONTEND_ADDR}/v1/supportbundles -H 'Accept: application/json' -H 'Accept-Encoding: gzip, deflate' -d '"${JSON_PAYLOAD}"'"
-
-SUPPORT_BUNDLE_URL=`kubectl exec -n longhorn-system svc/longhorn-frontend -- bash -c "${CURL_CMD}"  | jq -r '.links.self + "/" + .name'`
-
-SUPPORT_BUNDLE_READY=false
-while [[ ${SUPPORT_BUNDLE_READY} == false ]]; do
-    CMD_RESULT=`kubectl exec -n longhorn-system svc/longhorn-frontend -- curl -H 'Accept: application/json' ${SUPPORT_BUNDLE_URL}`
-    PERCENT=`echo "${CMD_RESULT}" | jq -r '.progressPercentage' || true`
-    echo ${PERCENT}
-    
-    if [[ ${PERCENT} == 100 ]]; then SUPPORT_BUNDLE_READY=true; fi
-done
-
-kubectl exec -n longhorn-system svc/longhorn-frontend -- curl -H 'Accept-Encoding: gzip, deflate' ${SUPPORT_BUNDLE_URL}/download > ${SUPPORT_BUNDLE_FILE_NAME}
+download_support_bundle(){
+  set -e
+  # get longhorn client api url
+  LH_CLIENT_URL=`kubectl get svc -n longhorn-system longhorn-frontend -o json | jq -r '.spec.clusterIP + ":" + (.spec.ports[0].port|tostring)'`
+
+  # create support bundle
+  JSON_PAYLOAD="{\"issueURL\": \"${SUPPORT_BUNDLE_ISSUE_DESC}\", \"description\": \"${SUPPORT_BUNDLE_ISSUE_DESC}\"}"
+  CURL_CMD="curl -s -XPOST http://${LH_CLIENT_URL}/v1/supportbundles -H 'Accept: application/json' -H 'Accept-Encoding: gzip, deflate' -d '"${JSON_PAYLOAD}"'"
+  echo ${CURL_CMD}
+  CREATE_SUPPORT_BUNDLE_RESP=`kubectl exec -n longhorn-system svc/longhorn-frontend -- bash -c "${CURL_CMD}"`
+  echo ${CREATE_SUPPORT_BUNDLE_RESP}
+  NODE_ID=`echo ${CREATE_SUPPORT_BUNDLE_RESP} | jq -r '.id'`
+  NAME=`echo ${CREATE_SUPPORT_BUNDLE_RESP} | jq -r '.name'`
+
+  # wait for support bundle url available
+  SUPPORT_BUNDLE_URL_READY=false
+  CURL_CMD="curl -s -GET http://${LH_CLIENT_URL}/v1/supportbundles/${NODE_ID}/${NAME} -H 'Accept: application/json' -H 'Accept-Encoding: gzip, deflate'"
+  MAX_RETRY=100
+  RETRY=0
+  while [[ ${SUPPORT_BUNDLE_URL_READY} == false ]] && [[ ${RETRY} -lt ${MAX_RETRY} ]]; do
+      GET_SUPPORT_BUNDLE_RESP=`kubectl exec -n longhorn-system svc/longhorn-frontend -- bash -c "${CURL_CMD}"`
+      echo ${GET_SUPPORT_BUNDLE_RESP}
+      SUPPORT_BUNDLE_PROGRESS=`echo ${GET_SUPPORT_BUNDLE_RESP} | jq -r '.progressPercentage'`
+      if [[ ${SUPPORT_BUNDLE_PROGRESS} == 100 ]]; then SUPPORT_BUNDLE_URL_READY=true; fi
+      RETRY=$((RETRY+1))
+      sleep 3s
+  done
+
+  # download support bundle
+  kubectl exec -n longhorn-system svc/longhorn-frontend -- curl -s -H 'Accept-Encoding: gzip, deflate' "http://${LH_CLIENT_URL}/v1/supportbundles/${NODE_ID}/${NAME}/download" > ${SUPPORT_BUNDLE_FILE_NAME}
+  set +e
+}
+
+MAX_RETRY=3
+RETRY=0
+while [[ ${RETRY} -lt ${MAX_RETRY} ]]; do
+  if download_support_bundle; then
+    break
+  else
+    RETRY=$((RETRY+1))
+  fi
+done
\ No newline at end of file