diff --git a/Dockerfile b/Dockerfile
index 309a433..b4f6a0e 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 ########################################################
 ############## We use a java base image ################
 ########################################################
-FROM openjdk:16-alpine AS build
-RUN apk --no-cache add curl
+FROM azul/zulu-openjdk-alpine:17-jre AS build
+RUN apk add curl jq
 
 LABEL Marc Tönsing <marc@marc.tv>
 
-ARG version=1.17.1
+ARG version=1.18.1
 
 
 ########################################################
@@ -18,21 +18,18 @@ RUN chmod +x /getpaperserver.sh
 RUN /getpaperserver.sh ${version}
 
 # Run paperclip and obtain patched jar
-RUN /opt/openjdk-16/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0
-
-# Copy built jar
-RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar
+RUN java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0
 
 ########################################################
 ############## Running environment #####################
 ########################################################
-FROM openjdk:16-alpine AS runtime
+FROM azul/zulu-openjdk-alpine:17-jre AS runtime
 
 # Working directory
 WORKDIR /data
 
 # Obtain runable jar from build stage
-COPY --from=build /opt/minecraft/paperspigot.jar /opt/minecraft/paperspigot.jar
+COPY --from=build /opt/minecraft/paperclip.jar /opt/minecraft/paperspigot.jar
 
 # Install and run rcon
 ARG RCON_CLI_VER=1.4.8
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index db55dda..7d51836 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then
 fi
 
 export HOME=/home/$DOCKER_USER
-exec su-exec $DOCKER_USER /opt/openjdk-16/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui
+exec su-exec $DOCKER_USER java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui
diff --git a/getpaperserver.sh b/getpaperserver.sh
index 88ef785..9f075e5 100755
--- a/getpaperserver.sh
+++ b/getpaperserver.sh
@@ -1,6 +1,9 @@
-# Script by https://github.com/TheRemote/RaspberryPiMinecraft/blob/master/SetupMinecraft.sh
+# original script by https://github.com/TheRemote/RaspberryPiMinecraft/blob/master/SetupMinecraft.sh
+# modified with jq 
 Version=$1
 BuildJSON=$(curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" https://papermc.io/api/v2/projects/paper/versions/$Version)
-Build=$(echo "$BuildJSON" | rev | cut -d, -f 1 | cut -d] -f 2 | rev)
-Build=$(($Build + 0))
-curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o paperclip.jar "https://papermc.io/api/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar"
\ No newline at end of file
+Build=$(echo "$BuildJSON" |     jq .builds[-1])
+curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o paperclip.jar "https://papermc.io/api/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar"
+echo -----------------
+echo $1#$Build
+echo -----------------
\ No newline at end of file