diff --git a/.github/scripts/mxbuild.Dockerfile b/.github/scripts/mxbuild.Dockerfile
index 26226380c..3f158b619 100644
--- a/.github/scripts/mxbuild.Dockerfile
+++ b/.github/scripts/mxbuild.Dockerfile
@@ -2,13 +2,14 @@ FROM mcr.microsoft.com/dotnet/runtime:8.0
 ARG MENDIX_VERSION
 
 RUN \
-    echo "Installing Java..." && \
+    echo "Installing Java 17..." && \
     apt-get -qq update && \
     apt-get -qq install -y wget libgdiplus && \
-    wget -q https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
-    mkdir /usr/lib/jvm && \
+    wget -q https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
+    mkdir -p /usr/lib/jvm && \
     tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm && \
-    rm /tmp/openjdk.tar.gz 
+    mv /usr/lib/jvm/jdk-17.0.2 /usr/lib/jvm/java-17-openjdk && \
+    rm /tmp/openjdk.tar.gz  
 
 RUN \
     echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
@@ -23,8 +24,8 @@ RUN \
 
 RUN \
     echo "#!/bin/bash -x" >/bin/mxbuild && \
-    echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/jdk-11.0.2 --java-exe-path=/usr/lib/jvm/jdk-11.0.2/bin/java \$@" >>/bin/mxbuild && \
-    chmod +x /bin/mxbuild 
+    echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/java-17-openjdk --java-exe-path=/usr/lib/jvm/java-17-openjdk/bin/java \$@" >>/bin/mxbuild && \
+    chmod +x /bin/mxbuild  
 
 RUN \
     echo "#!/bin/bash -x" >/bin/mx && \
diff --git a/.github/workflows/NativePipeline.yml b/.github/workflows/NativePipeline.yml
index 8ade70e7e..0214a0856 100644
--- a/.github/workflows/NativePipeline.yml
+++ b/.github/workflows/NativePipeline.yml
@@ -3,12 +3,12 @@ on:
   workflow_dispatch:
     inputs:
       mendix_version:
-        description: "Provide the SP version to be used (e.g., 10.14.0.43709). If empty, latest defined version from Mendix versions.json will be used."
+        description: "Provide the SP version to be used (e.g., 10.14.0.43709) - has to be a released version (Default: latest from Mendix versions.json)"
         required: false
         default: ""
 
       nt_branch:
-        description: "Native Template branch to use (default: master)"
+        description: "Native Template branch to use (Default: master)"
         default: "master"
         required: false
         type: string