diff --git a/.ci/jobs/apm-agent-java-load.yml b/.ci/jobs/apm-agent-java-load.yml
new file mode 100644
index 0000000000..016515b46a
--- /dev/null
+++ b/.ci/jobs/apm-agent-java-load.yml
@@ -0,0 +1,19 @@
+##### LOAD TESTING JOB
+- job:
+    name: apm-agent-java/apm-agent-java-load
+    display-name: APM Agent Java Load Testing
+    description: APM Agent Java Load Testing
+    project-type: pipeline
+    pipeline-scm:
+      script-path: .ci/load/Jenkinsfile
+      scm:
+        - git:
+            url: git@github.com:elastic/apm-agent-java.git
+            refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/*
+            wipe-workspace: 'True'
+            name: origin
+            shallow-clone: true
+            credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
+            reference-repo: /var/lib/jenkins/.git-references/apm-agent-java.git
+            branches:
+              - master
diff --git a/.ci/jobs/apm-agent-java-mbp.yml b/.ci/jobs/apm-agent-java-mbp.yml
index eb8978c2b7..7b877551b8 100644
--- a/.ci/jobs/apm-agent-java-mbp.yml
+++ b/.ci/jobs/apm-agent-java-mbp.yml
@@ -1,5 +1,44 @@
 ---
+##### MBP JOB
 - job:
     name: apm-agent-java/apm-agent-java-mbp
     display-name: APM Agent Java
     description: APM Agent Java
+    script-path: Jenkinsfile
+    project-type: multibranch
+    scm:
+        - github:
+            branch-discovery: no-pr
+            discover-pr-forks-strategy: merge-current
+            discover-pr-forks-trust: permission
+            discover-pr-origin: merge-current
+            discover-tags: true
+            notification-context: 'apm-ci'
+            repo: apm-agent-java
+            repo-owner: elastic
+            credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
+            ssh-checkout:
+            credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+            build-strategies:
+            - tags:
+                ignore-tags-older-than: -1
+                ignore-tags-newer-than: -1
+            - regular-branches: true
+            - change-request:
+                ignore-target-only-changes: false
+            clean:
+            after: true
+            before: true
+            prune: true
+            shallow-clone: false
+            depth: 3
+            do-not-fetch-tags: true
+            submodule:
+            disable: false
+            recursive: true
+            parent-credentials: true
+            timeout: 100
+            reference-repo: /var/lib/jenkins/.git-references/apm-agent-java.git
+            timeout: '15'
+            use-author: true
+            wipe-workspace: 'True'
\ No newline at end of file
diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml
index a04535c2e1..d35b802b0d 100644
--- a/.ci/jobs/defaults.yml
+++ b/.ci/jobs/defaults.yml
@@ -9,7 +9,6 @@
 
 - job:
     view: APM-CI
-    project-type: multibranch
     logrotate:
       daysToKeep: 30
       numToKeep: 100
@@ -17,43 +16,6 @@
     days-to-keep: '1'
     concurrent: true
     node: linux
-    script-path: Jenkinsfile
-    scm:
-    - github:
-        branch-discovery: no-pr
-        discover-pr-forks-strategy: merge-current
-        discover-pr-forks-trust: permission
-        discover-pr-origin: merge-current
-        discover-tags: true
-        notification-context: 'apm-ci'
-        repo: apm-agent-java
-        repo-owner: elastic
-        credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
-        ssh-checkout:
-          credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-        build-strategies:
-        - tags:
-            ignore-tags-older-than: -1
-            ignore-tags-newer-than: -1
-        - regular-branches: true
-        - change-request:
-            ignore-target-only-changes: false
-        clean:
-          after: true
-          before: true
-        prune: true
-        shallow-clone: false
-        depth: 3
-        do-not-fetch-tags: true
-        submodule:
-          disable: false
-          recursive: true
-          parent-credentials: true
-          timeout: 100
-          reference-repo: /var/lib/jenkins/.git-references/apm-agent-java.git
-        timeout: '15'
-        use-author: true
-        wipe-workspace: 'True'
     periodic-folder-trigger: 1w
     prune-dead-branches: true
     publishers: