diff --git a/build-versions.sh b/build-versions.sh
index 3df804f..09009be 100755
--- a/build-versions.sh
+++ b/build-versions.sh
@@ -99,6 +99,7 @@ if [ ! -z ${BUILD_JAVA_21+x} ]; then
         -e MAVEN_CONFIG=/var/maven/.m2 \
         -e M2_PATH=/var/maven/.m2 \
         -e REV="$BUILD_JAVA_21" \
+        -e SERVER_REQUIRED="$SERVER_REQUIRED" \
         --volume "$BUILD_DIRECTORY:/build" \
         --volume "$M2_DIRECTORY:/var/maven/.m2" \
         --volume "$SCRIPT_DIR/scripts:/scripts" \
@@ -118,6 +119,7 @@ if [ ! -z ${BUILD_JAVA_17+x} ]; then
         -e MAVEN_CONFIG=/var/maven/.m2 \
         -e M2_PATH=/var/maven/.m2 \
         -e REV="$BUILD_JAVA_17" \
+        -e SERVER_REQUIRED="$SERVER_REQUIRED" \
         --volume "$BUILD_DIRECTORY:/build" \
         --volume "$M2_DIRECTORY:/var/maven/.m2" \
         --volume "$SCRIPT_DIR/scripts:/scripts" \
@@ -137,6 +139,7 @@ if [ ! -z ${BUILD_JAVA_8+x} ]; then
         -e MAVEN_CONFIG=/var/maven/.m2 \
         -e M2_PATH=/var/maven/.m2 \
         -e REV="$BUILD_JAVA_8" \
+        -e SERVER_REQUIRED="$SERVER_REQUIRED" \
         --volume "$BUILD_DIRECTORY:/build" \
         --volume "$M2_DIRECTORY:/var/maven/.m2" \
         --volume "$SCRIPT_DIR/scripts:/scripts" \
diff --git a/run.sh b/run.sh
index d5d3eab..ad35019 100755
--- a/run.sh
+++ b/run.sh
@@ -4,6 +4,7 @@ SCRIPT_DIR=$(dirname "$0")
 
 WORKSPACE=$(pwd)
 
+export SERVER_REQUIRED="false"
 source "$SCRIPT_DIR/build-versions.sh"
 
 echo "Mounting m2 from $M2_DIRECTORY"
diff --git a/run_server.sh b/run_server.sh
index 5170693..5020985 100755
--- a/run_server.sh
+++ b/run_server.sh
@@ -12,6 +12,7 @@ SCRIPT_DIR=$(dirname "$0")
 
 WORKSPACE=$(pwd)
 
+export SERVER_REQUIRED="true"
 source "$SCRIPT_DIR/build-versions.sh"
 
 docker run --rm -it \
@@ -23,4 +24,4 @@ docker run --rm -it \
     --volume "$WORKSPACE:/workspace" \
     --volume "$M2_DIRECTORY:/var/maven/.m2" \
     --volume "$SCRIPT_DIR/scripts:/scripts" \
-    -- docker.io/maven:3.9.11-eclipse-temurin-${JAVA_VERSION:-21} /scripts/initialize.sh java -Xms4096M -Xmx4096M -jar "$SCRIPT_DIR/build/spigot-${REV}-R0.1-SNAPSHOT.jar" --nogui
\ No newline at end of file
+    -- docker.io/maven:3.9.11-eclipse-temurin-${JAVA_VERSION:-21} /scripts/initialize.sh java -Xms4096M -Xmx4096M -jar "/build/spigot-${REV}.jar" --nogui
\ No newline at end of file
diff --git a/scripts/install-spigot.sh b/scripts/install-spigot.sh
index 6d99f1a..63674ad 100755
--- a/scripts/install-spigot.sh
+++ b/scripts/install-spigot.sh
@@ -15,7 +15,7 @@ for ver in "${versions[@]}"; do
   mvn -q org.apache.maven.plugins:maven-dependency-plugin:3.9.0:get -Dartifact=org.spigotmc:spigot:${ver}-R0.1-SNAPSHOT
 
   ARTIFACT="spigot-${ver}.jar"
-  if [ "$?" -eq 0 ] && [ -e "/build/$ARTIFACT" ]; then
+  if [ "$?" -eq 0 ] && [[ "$SERVER_REQUIRED" == "false" || -e "/build/$ARTIFACT" ]]; then
     echo "Located spigot $ver successfully"
   else
     echo "Spigot $ver not located, building..."