diff --git a/Dockerfile.maven-java25 b/Dockerfile.maven-java25
new file mode 100644
index 000000000..231cc37b5
--- /dev/null
+++ b/Dockerfile.maven-java25
@@ -0,0 +1,13 @@
+FROM eclipse-temurin:25-jdk
+
+# Install basic tools
+RUN apt-get update && \
+    apt-get install -y git && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /workspace
+
+# Maven will be provided by the project's mvnw wrapper
+CMD ["bash"]
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d6d5ee30..0e8147745 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -89,12 +89,11 @@ pipeline {
                 echo 'Running SonarQube analysis...'
                 withSonarQubeEnv('SonarQubeServer') {
                     sh """
-                        ./mvnw clean verify sonar:sonar \
+                        mvn clean verify sonar:sonar \
                         -DskipTests \
                         -Dsonar.projectKey=${SONAR_PROJECT_KEY} \
                         -Dsonar.projectName=${PROJECT_NAME} \
-                        -Dsonar.projectVersion=${BUILD_NUMBER} \
-                        -Dsonar.host.url=http://sonarqube:9000 \
+                        -Dsonar.host.url=${SONAR_HOST_URL} \
                         -Dsonar.token=${SONAR_AUTH_TOKEN}
                     """
                 }