diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 496a42250..53111d622 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -10,8 +10,8 @@ pipeline {
     DOCKER_COMPOSE_VERSION = '1.25.5'
     JOB_GIT_CREDENTIALS = "f6c7695a-671e-4f4f-a331-acdce44ff9ba"
     PIPELINE_LOG_LEVEL='INFO'
-    JOB_GCS_BUCKET = 'beats-ci-artifacts'
-    JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials'
+    JOB_GCS_BUCKET = 'fleet-ci-artifacts'
+    JOB_GCS_CREDENTIALS = 'fleet-ci-gcs-plugin-file-credentials'
   }
   options {
     timeout(time: 1, unit: 'HOURS')
diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml
index d749f5b0c..0e3defc4e 100644
--- a/.ci/jobs/defaults.yml
+++ b/.ci/jobs/defaults.yml
@@ -3,7 +3,7 @@
 ##### GLOBAL METADATA
 
 - meta:
-    cluster: beats-ci
+    cluster: fleet-ci
 
 ##### JOB DEFAULTS
 
@@ -15,4 +15,4 @@
     publishers:
       - email:
           recipients: infra-root+build@elastic.co
-    prune-dead-branches: true
\ No newline at end of file
+    prune-dead-branches: true
diff --git a/.ci/jobs/fleet-server-package-mbp.yml b/.ci/jobs/fleet-server-package-mbp.yml
index 2a519cb73..d911c7bf9 100644
--- a/.ci/jobs/fleet-server-package-mbp.yml
+++ b/.ci/jobs/fleet-server-package-mbp.yml
@@ -1,6 +1,6 @@
 ---
 - job:
-    name: Ingest-manager/fleet-server-package-mbp
+    name: fleet-server/fleet-server-package-mbp
     display-name: Fleet Server Package
     description: Jenkins pipeline for the Elastic Fleet Server package process
     project-type: multibranch
@@ -53,4 +53,4 @@
           reference-repo: /var/lib/jenkins/.git-references/fleet-server.git
         timeout: '15'
         use-author: true
-        wipe-workspace: 'True'
+        wipe-workspace: true
diff --git a/.ci/jobs/fleet-server.yml b/.ci/jobs/fleet-server.yml
index 5c71b0094..18ff2884b 100644
--- a/.ci/jobs/fleet-server.yml
+++ b/.ci/jobs/fleet-server.yml
@@ -1,6 +1,6 @@
 ---
 - job:
-    name: Ingest-manager/fleet-server
+    name: fleet-server/fleet-server-mbp
     display-name: Fleet Server
     description: Jenkins pipeline for the Elastic Fleet Server project
     view: Beats
diff --git a/.ci/jobs/folders.yml b/.ci/jobs/folders.yml
index c0cd03617..178ab4dc6 100644
--- a/.ci/jobs/folders.yml
+++ b/.ci/jobs/folders.yml
@@ -1,10 +1,10 @@
 ---
 #https://docs.openstack.org/infra/jenkins-job-builder/project_folder.html
 - job:
-    name: Ingest-manager
-    description: Ingest manager related Jobs
+    name: fleet-server
+    description: Fleet Server related Jobs
     project-type: folder
 
 - view:
-    name: Ingest-manager
-    view-type: list
\ No newline at end of file
+    name: fleet-server
+    view-type: list
diff --git a/README.md b/README.md
index 1ca907f1a..d39be5dba 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://beats-ci.elastic.co/job/Ingest-manager/job/fleet-server/job/main/badge/icon)](https://beats-ci.elastic.co/job/Ingest-manager/job/fleet-server/job/main/)
+[![Build Status](https://fleet-ci.elastic.co/job/fleet-server/job/fleet-server-mbp/job/main/badge/icon)](https://fleet-ci.elastic.co/job/Ingest-manager/job/fleet-server/job/main/)
 
 # Fleet Server implementation