diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2
index fb9d4749e17..5de76817c06 100644
--- a/.circleci/config.continue.yml.j2
+++ b/.circleci/config.continue.yml.j2
@@ -778,8 +778,9 @@ jobs:
       - run:
           name: Copy jar file to system test binaries folder
           command: |
-            ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs
-            cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/
+            pwd
+            ls -la /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs
+            cp /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/
 
       - run:
           name: Build
@@ -849,8 +850,8 @@ jobs:
       - run:
           name: Copy jar file to system test binaries folder
           command: |
-            ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs
-            cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/
+            ls -la /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs
+            cp /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/
 
       - run:
           name: Build
@@ -882,8 +883,8 @@ jobs:
       - run:
           name: Copy jar file to system test binaries folder
           command: |
-            ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs
-            cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/
+            ls -la /home/non-root-user/dd-trace-java/dd-java-agent/build/libs
+            cp /home/non-root-user/dd-trace-java/dd-java-agent/build/libs/*.jar system-tests/binaries/
 
       - run:
           name: Build
@@ -926,10 +927,10 @@ jobs:
       - run:
           name: Copy jar files to system test binaries folder
           command: |
-            ls -la ~/dd-trace-java/workspace/dd-trace-api/build/libs
-            ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs
-            cp ~/dd-trace-java/workspace/dd-trace-api/build/libs/*.jar system-tests/binaries/
-            cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/
+            ls -la /home/non-root-user/dd-trace-api/build/libs
+            ls -la /home/non-root-user/dd-java-agent/build/libs
+            cp /home/non-root-user/dd-trace-api/build/libs/*.jar system-tests/binaries/
+            cp /home/non-root-user/dd-java-agent/build/libs/*.jar system-tests/binaries/
 
 
       - run:
diff --git a/.circleci/render_config.py b/.circleci/render_config.py
index c9a7299148c..7e781d0bb40 100755
--- a/.circleci/render_config.py
+++ b/.circleci/render_config.py
@@ -30,7 +30,7 @@
 }
 # Version to use for all the base Docker images, see
 # https://github.com/DataDog/dd-trace-java-docker-build/pkgs/container/dd-trace-java-docker-build
-DOCKER_IMAGE_VERSION="v25.01"
+DOCKER_IMAGE_VERSION="95_merge"
 
 # Get labels from pull requests to override some defaults for jobs to run.
 # `run-tests: all` will run all tests.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f175868c407..aa69b8887d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ variables:
   GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties
   MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
   GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
-  JAVA_BUILD_IMAGE_VERSION: "v25.01"
+  JAVA_BUILD_IMAGE_VERSION: "95_merge"
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   DEFAULT_TEST_JVMS: /^(8|11|17|21)$/
   PROFILE_TESTS: