diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a3111bd..3086ad0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,6 +14,7 @@ defaults:
   run:
     working-directory: ./client
 on:
+  workflow_dispatch:
   schedule:
     - cron: '19 3 * * 5'
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 8125f2b..22409f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,22 +60,21 @@ pipeline {
         YARN_CACHE_FOLDER = "${env.WORKSPACE}/yarn-cache"
         SPAWN_WRAP_SHIM_ROOT = "${env.WORKSPACE}"
         EMAIL_TO= "glsp-build@eclipse.org"
-        MAVEN_VERSION = "3.9.14"
-
     }
-    
+
     stages {
         stage('Download & Setup Maven') {
             steps {
                 container('ci') {
                     sh '''
-                        curl -o maven.tar.gz -L https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz
+                        MAVEN_VERSION=$(curl -sf "https://dlcdn.apache.org/maven/maven-3/" | grep -o 'href="[0-9][^"]*"' | tr -dc '0-9.')
+                        curl -o maven.tar.gz -L "https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
                         tar -xzf maven.tar.gz -C ${WORKSPACE}
                         rm -f maven.tar.gz
+                        echo "${WORKSPACE}/apache-maven-${MAVEN_VERSION}" > ${WORKSPACE}/.maven_home
                     '''
-                    // Set MAVEN_HOME manually
                     script {
-                        env.MAVEN_HOME = "${env.WORKSPACE}/apache-maven-${env.MAVEN_VERSION}"
+                        env.MAVEN_HOME = sh(script: "cat ${env.WORKSPACE}/.maven_home", returnStdout: true).trim()
                         env.PATH = "${env.MAVEN_HOME}/bin:${env.PATH}"
                     }
                     sh "echo 'MAVEN_HOME set to ${env.MAVEN_HOME}'"