diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
index 5d421c720..3720f89ec 100644
--- a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
+++ b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
@@ -222,7 +222,7 @@ private String getMavenSetup() {
         <settings>
           <mirrors>
             <mirror>
-              <id>mirror.default</id>
+              <id>indy-mvn</id>
               <url>${PROXY_URL}</url>
               <mirrorOf>*</mirrorOf>
             </mirror>
@@ -237,7 +237,7 @@ private String getMavenSetup() {
           <!-- Allows a secondary Maven build to use results of prior (e.g. Gradle) deployment -->
           <profiles>
             <profile>
-              <id>alternate</id>
+              <id>secondary</id>
               <activation>
                 <activeByDefault>true</activeByDefault>
               </activation>
@@ -263,7 +263,7 @@ private String getMavenSetup() {
               </pluginRepositories>
             </profile>
             <profile>
-              <id>deployment</id>
+              <id>local-deployment</id>
               <activation>
                 <activeByDefault>true</activeByDefault>
               </activation>
@@ -281,6 +281,25 @@ private String getMavenSetup() {
         // This block is only needed when running outside of JBS
         if (isEmpty(System.getenv("jvm-build-service"))) {
             result += """
+          <!--
+            Needed for Maven 3.9+. Switched to native resolver
+            https://maven.apache.org/guides/mini/guide-resolver-transport.html
+          -->
+          <servers>
+            <server>
+              <id>indy-mvn</id>
+              <configuration>
+                <connectionTimeout>60000</connectionTimeout>
+                <httpHeaders>
+                  <property>
+                    <name>Authorization</name>
+                    <value>Bearer ${accessToken}</value>
+                  </property>
+                </httpHeaders>
+              </configuration>
+            </server>
+          </servers>
+
           <proxies>
             <proxy>
               <id>indy-http</id>
@@ -291,7 +310,7 @@ private String getMavenSetup() {
               <!-- <username>build-ADDTW3JAGHYAA+tracking</username> -->
               <username>${BUILD_ID}+tracking</username>
               <password>${MVN_TOKEN}</password>
-              <nonProxyHosts>indy|localhost</nonProxyHosts>
+              <nonProxyHosts>${PROXY_URL}|localhost</nonProxyHosts>
             </proxy>
             <proxy>
               <id>indy-https</id>
@@ -301,7 +320,7 @@ private String getMavenSetup() {
               <port>80</port>
               <username>${BUILD_ID}+tracking</username>
               <password>${MVN_TOKEN}</password>
-              <nonProxyHosts>indy|localhost</nonProxyHosts>
+              <nonProxyHosts>${PROXY_URL}|localhost</nonProxyHosts>
             </proxy>
           </proxies>
         """;
diff --git a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
index 1be3c887c..8f6a33fd7 100644
--- a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
+++ b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
@@ -47,7 +47,7 @@ type SystemConfigList struct {
 
 const (
 	KonfluxGitDefinition          = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
-	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/rnc/jvm-build-service/SCRIPTS/deploy/tasks/pre-build.yaml"
+	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
 	KonfluxBuildDefinitions       = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml"
 	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
 )
diff --git a/pkg/reconciler/dependencybuild/dependencybuild.go b/pkg/reconciler/dependencybuild/dependencybuild.go
index 73446b6ed..30b05d7fe 100644
--- a/pkg/reconciler/dependencybuild/dependencybuild.go
+++ b/pkg/reconciler/dependencybuild/dependencybuild.go
@@ -73,7 +73,6 @@ const (
 	MemoryIncrement = 2048
 
 	PipelineRunFinalizer = "jvmbuildservice.io/finalizer"
-	JavaHome             = "JAVA_HOME"
 	DeploySuffix         = "-deploy"
 )
 
@@ -468,9 +467,7 @@ func (r *ReconcileDependencyBuild) processBuilderImages(ctx context.Context) ([]
 	if err != nil {
 		return nil, err
 	}
-	//TODO how important is the order here?  do we want 11,8,17 per the old form at https://github.com/redhat-appstudio/jvm-build-service/blob/b91ec6e1888e43962cba16fcaee94e0c9f64557d/deploy/operator/config/system-config.yaml#L8
-	// the unit tests's imaage verification certainly assumes a order
-	result := []BuilderImage{}
+	result := make([]BuilderImage, 0)
 	for _, val := range systemConfig.Spec.Builders {
 		result = append(result, BuilderImage{
 			Image:    val.Image,