diff --git a/Makefile.toml b/Makefile.toml
index 94b199d94439d..274941161846d 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -599,11 +599,18 @@ else
 fi
 
 ARTIFACT="risingwave-connector-1.0.0.tar.gz"
+TARGET_PATH="${JAVA_DIR}/connector-node/assembly/target/${ARTIFACT}"
 
-cd "${JAVA_DIR}"
-"${MAVEN_PATH}" --batch-mode --update-snapshots clean package -Dmaven.test.skip
+if [[ ! -f ${TARGET_PATH} ]] || [[ ! -z ${REBUILD_CONNECTOR_NODE} ]]; then
+  echo "Rebuild connector node"
+  cd "${JAVA_DIR}"
+  "${MAVEN_PATH}" --batch-mode --update-snapshots clean package -Dmaven.test.skip
+else
+  echo "Connector node was built already. Skipped. Set REBUILD_CONNECTOR_NODE=1 to enable rebuild"
+fi
+rm -rf ${PREFIX_BIN}/connector-node
 mkdir -p "${PREFIX_BIN}/connector-node"
-tar xf "${JAVA_DIR}/connector-node/assembly/target/${ARTIFACT}" -C "${PREFIX_BIN}/connector-node"
+tar xf ${TARGET_PATH} -C "${PREFIX_BIN}/connector-node"
 '''
 
 
diff --git a/src/risedevtool/connector.toml b/src/risedevtool/connector.toml
index 0d826f4edd948..55b485412dde1 100644
--- a/src/risedevtool/connector.toml
+++ b/src/risedevtool/connector.toml
@@ -49,8 +49,8 @@ description = "Download Maven"
 script = '''
 #!/usr/bin/env bash
 
-if !(command -v javac &> /dev/null && [[ "$(javac -version 2>&1 | awk '{print $2}')" =~ "11" ]]); then
-  echo "JDK 11 is not installed. Please install JDK 11 first."
+if !(command -v javac &> /dev/null && [[ "$(javac -version 2>&1 | awk '{print $2}')" =~ ^(11|17) ]]); then
+  echo "JDK 11+ is not installed. Please install JDK 11+ first."
   exit 1
 fi