diff --git a/humble/doc-build.yaml b/humble/doc-build.yaml
index c0e898c2..b6477e44 100644
--- a/humble/doc-build.yaml
+++ b/humble/doc-build.yaml
@@ -52,8 +52,8 @@ targets:
     jammy:
       amd64:
 type: doc-build
-upload_credential_id: jenkins-agent
+upload_credential_id: rosdocs
 upload_host: docs.ros.org
 upload_root: /var/www/docs.ros.org/en/ros2_packages
-upload_user: rosbot
+upload_user: rosdocs
 version: 2
diff --git a/iron/doc-build.yaml b/iron/doc-build.yaml
index c0e898c2..b6477e44 100644
--- a/iron/doc-build.yaml
+++ b/iron/doc-build.yaml
@@ -52,8 +52,8 @@ targets:
     jammy:
       amd64:
 type: doc-build
-upload_credential_id: jenkins-agent
+upload_credential_id: rosdocs
 upload_host: docs.ros.org
 upload_root: /var/www/docs.ros.org/en/ros2_packages
-upload_user: rosbot
+upload_user: rosdocs
 version: 2
diff --git a/jazzy/doc-build.yaml b/jazzy/doc-build.yaml
index 4d17169d..3bd5b15c 100644
--- a/jazzy/doc-build.yaml
+++ b/jazzy/doc-build.yaml
@@ -52,8 +52,8 @@ targets:
     noble:
       amd64:
 type: doc-build
-upload_credential_id: jenkins-agent
+upload_credential_id: rosdocs
 upload_host: docs.ros.org
 upload_root: /var/www/docs.ros.org/en/ros2_packages
-upload_user: rosbot
+upload_user: rosdocs
 version: 2
diff --git a/rolling/doc-build.yaml b/rolling/doc-build.yaml
index 4d17169d..3bd5b15c 100644
--- a/rolling/doc-build.yaml
+++ b/rolling/doc-build.yaml
@@ -52,8 +52,8 @@ targets:
     noble:
       amd64:
 type: doc-build
-upload_credential_id: jenkins-agent
+upload_credential_id: rosdocs
 upload_host: docs.ros.org
 upload_root: /var/www/docs.ros.org/en/ros2_packages
-upload_user: rosbot
+upload_user: rosdocs
 version: 2