diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
index 2769aa5c1d6..4316eda85e1 100644
--- a/JenkinsJobs/Builds/I_build.groovy
+++ b/JenkinsJobs/Builds/I_build.groovy
@@ -74,11 +74,11 @@ spec:
   }
   tools {
       jdk 'temurin-jdk21-latest'
+      maven 'apache-maven-latest'
   }
   environment {
       MAVEN_OPTS = "-Xmx6G"
       CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production"
-      PATH = "$PATH:/opt/tools/apache-maven/latest/bin"
       logDir = "$CJE_ROOT/buildlogs"
     }
   stages {
@@ -185,7 +185,6 @@ spec:
                             echo "Failed in Download reference repo for repo reports stage"
                             exit 1
                         fi
-                        cd ${WORKSPACE}
                     \'\'\'
                   }
                 }
diff --git a/JenkinsJobs/YBuilds/Y_build.groovy b/JenkinsJobs/YBuilds/Y_build.groovy
index 66c3ea61b47..f92593fe4c1 100644
--- a/JenkinsJobs/YBuilds/Y_build.groovy
+++ b/JenkinsJobs/YBuilds/Y_build.groovy
@@ -71,11 +71,11 @@ spec:
   }
   tools {
       jdk 'openjdk-jdk17-latest'
+      maven 'apache-maven-latest'
   }
   environment {
       MAVEN_OPTS = "-Xmx6G"
       CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production"
-      PATH = "$PATH:/opt/tools/apache-maven/latest/bin"
       logDir = "$CJE_ROOT/buildlogs"
     }
   
@@ -257,7 +257,8 @@ spec:
 		}
 	  stage('Aggregator maven build'){
           environment {
-                KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
+                KEYRING = credentials('secret-subkeys-releng.asc')
+                MAVEN_GPG_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
           }
           steps {
               container('jnlp') {