diff --git a/.ci/check-changelogs.groovy b/.ci/check-changelogs.groovy
index 436e2eff257..131b4fcf5d3 100644
--- a/.ci/check-changelogs.groovy
+++ b/.ci/check-changelogs.groovy
@@ -12,7 +12,7 @@ pipeline {
   }
   options {
     timeout(time: 1, unit: 'HOURS')
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
+    buildDiscarder(logRotator(numToKeepStr: '100', artifactNumToKeepStr: '30', daysToKeepStr: '30'))
     timestamps()
     ansiColor('xterm')
     disableResume()
diff --git a/.ci/jobs/apm-server-check-changelogs-mbp.yml b/.ci/jobs/apm-server-check-changelogs-mbp.yml
new file mode 100644
index 00000000000..cdd552c5c23
--- /dev/null
+++ b/.ci/jobs/apm-server-check-changelogs-mbp.yml
@@ -0,0 +1,40 @@
+---
+- job:
+    name: apm-server/apm-server-check-changelogs-mbp
+    display-name: APM Server check changelogs MBP
+    description: APM Server check changelogs MBP
+    project-type: multibranch
+    script-path: .ci/check-changelogs.groovy
+    scm:
+    - github:
+        branch-discovery: no-pr
+        discover-pr-forks-strategy: merge-current
+        discover-pr-forks-trust: permission
+        discover-pr-origin: merge-current
+        discover-tags: false
+        notification-context: 'apm-ci'
+        property-strategies:
+          all-branches:
+          - suppress-scm-triggering: true
+        repo: apm-server
+        repo-owner: elastic
+        credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
+        ssh-checkout:
+          credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+        clean:
+          after: true
+          before: true
+        prune: true
+        shallow-clone: true
+        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-server.git
+        timeout: '15'
+        use-author: true
+        wipe-workspace: 'True'
+    periodic-folder-trigger: 1w
diff --git a/.ci/jobs/apm-server-mbp.yml b/.ci/jobs/apm-server-mbp.yml
new file mode 100644
index 00000000000..0db390fcf69
--- /dev/null
+++ b/.ci/jobs/apm-server-mbp.yml
@@ -0,0 +1,44 @@
+---
+- job:
+    name: apm-server/apm-server-mbp
+    display-name: APM Server
+    description: APM Server
+    project-type: multibranch
+    concurrent: true
+    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-server
+        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: true
+        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-server.git
+        timeout: '15'
+        use-author: true
+        wipe-workspace: 'True'
diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml
new file mode 100644
index 00000000000..89eb878dc57
--- /dev/null
+++ b/.ci/jobs/defaults.yml
@@ -0,0 +1,19 @@
+---
+
+##### GLOBAL METADATA
+
+- meta:
+    cluster: apm-ci
+
+##### JOB DEFAULTS
+
+- job:
+    view: APM-CI
+    logrotate:
+      numToKeep: 100
+    node: linux
+    periodic-folder-trigger: 1d
+    prune-dead-branches: true
+    publishers:
+    - email:
+        recipients: infra-root+build@elastic.co
diff --git a/Jenkinsfile b/Jenkinsfile
index 526050c655a..b6caf572a5f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
   }
   options {
     timeout(time: 2, unit: 'HOURS')
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
+    buildDiscarder(logRotator(numToKeepStr: '100', artifactNumToKeepStr: '30', daysToKeepStr: '30'))
     timestamps()
     ansiColor('xterm')
     disableResume()