diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index 874d5fbbb72f65c73f1538f968a633efeb80df0b..af0b0fe8a537f2374bc340d98d2b14b9d61cb713 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -881,7 +881,7 @@ function deploy_pyroscope() {
     fi
 
     if which pyroscope >/dev/null; then
-        nohup PYROSCOPE_RETENTION=72h pyroscope server &
+        PYROSCOPE_RETENTION=72h nohup pyroscope server &
         return
     fi
 
@@ -897,7 +897,7 @@ function deploy_pyroscope() {
     fi
 
     yum install ${PYROSCOPE_LOCAL_RPM} -y || echo_err_exit "Error: fail to install $PYROSCOPE_LOCAL_RPM"
-    nohup PYROSCOPE_RETENTION=72h pyroscope server &
+    PYROSCOPE_RETENTION=72h nohup pyroscope server &
 }
 
 function deploy_middleware() {
@@ -1046,7 +1046,7 @@ function deploy_grafana() {
     while ! netstat -tunpl | grep ':3000' | grep 'LISTEN' | grep -q 'grafana' ; do
         sleep 1
         let i+=1
-        if [ $i -ge 10 ] ; then
+        if [ $i -ge 60 ] ; then
             echo_err_exit "Fail to connect grafana, check container status"
         fi
     done