diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
index 98d0d1ceac91cfbf9ea8770fa5046432b6fb4c22..a04277fbaa9b962c06903e0ffd02cfe6cf57b361 100644
--- a/.gitlab-ci.yaml
+++ b/.gitlab-ci.yaml
@@ -55,17 +55,10 @@ hivemind_sync:
       artifacts: true
   variables:
     GIT_STRATEGY: none
-    HIVEMIND_MAX_BLOCK: 50000
 
   script:
     - scripts/ci_sync.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_MAX_BLOCK
-    - echo Attempting to start hive server listening on $HIVEMIND_HTTP_PORT port...
-    - if [ -f hive_server.pid ]; then kill -SIGINT `cat hive_server.pid`; fi;
-    - rm -f hive_server.pid
-    - screen -L -Logfile hive_server.log -dmS hive_server_$CI_JOB_ID ./local-site/bin/hive server --pid-file hive_server.pid --http-server-port $HIVEMIND_HTTP_PORT --steemd-url "$HIVEMIND_SOURCE_HIVED_URL" --database-url $DB_URL
-    - for i in `seq 1 10`; do if [ -f hive_server.pid ]; then break; else sleep 1; fi;  done
-    - cat hive_server.pid
-    
+    - scripts/ci_start_server.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_HTTP_PORT
   artifacts:
     paths:
       - hivemind-sync.log
@@ -85,12 +78,8 @@ hivemind_start_server:
     GIT_STRATEGY: none
 
   script:
-    - echo Attempting to start hive server listening on $HIVEMIND_HTTP_PORT port...
-    - if [ -f hive_server.pid ]; then kill -SIGINT `cat hive_server.pid`; fi;
-    - rm -f hive_server.pid
-    - screen -L -Logfile hive_server.log -dmS hive_server_$CI_JOB_ID ./local-site/bin/hive server --pid-file hive_server.pid --http-server-port $HIVEMIND_HTTP_PORT --steemd-url "$HIVEMIND_SOURCE_HIVED_URL" --database-url $DB_URL
-    - for i in `seq 1 10`; do if [ -f hive_server.pid ]; then break; else sleep 1; fi;  done
-    - cat hive_server.pid
+    - scripts/ci_start_server.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_HTTP_PORT
+
   artifacts:
     paths:
       - hive_server.log
diff --git a/scripts/ci_start_server.sh b/scripts/ci_start_server.sh
index 1e11c4b465b6b00f5668692eb956e38c5b40b40e..f0efc1051c39c687e398cb89f5b7b3ab33aff46e 100644
--- a/scripts/ci_start_server.sh
+++ b/scripts/ci_start_server.sh
@@ -20,4 +20,5 @@ if [ -f hive_server.pid ]; then kill -SIGINT `cat hive_server.pid`; fi;
 rm -f hive_server.pid
 screen -L -Logfile hive_server.log -dmS hive_server_$CI_JOB_ID ./local-site/bin/hive server --pid-file hive_server.pid --http-server-port $HIVEMIND_HTTP_PORT --steemd-url "$HIVEMIND_SOURCE_HIVED_URL" --database-url $DB_URL
 for i in `seq 1 10`; do if [ -f hive_server.pid ]; then break; else sleep 1; fi;  done
-cat hive_server.pid
+if [ -f hive_server.pid ]; then echo "Hive server started successfully..."; else "Hive server start failure..." ; fi;
+