diff --git a/playbooks/api-jobs/promote.yaml b/playbooks/api-jobs/promote.yaml
index abd6f9fdb4..ecf510016c 100644
--- a/playbooks/api-jobs/promote.yaml
+++ b/playbooks/api-jobs/promote.yaml
@@ -59,7 +59,7 @@
         state: directory
     - name: Upload to AFS
       include_role:
-        name: upload-afs
+        name: upload-afs-roots
       vars:
         afs_source: "{{ zuul.executor.work_root }}/docs/"
         afs_target: "{{ target_dir }}"
diff --git a/playbooks/publish/install-guide.yaml b/playbooks/publish/install-guide.yaml
index 04b8fed013..2f58ab6509 100644
--- a/playbooks/publish/install-guide.yaml
+++ b/playbooks/publish/install-guide.yaml
@@ -13,7 +13,7 @@
       when: zuul_success | bool
     - role: create-afs-token
       when: zuul_success | bool
-    - role: upload-afs
+    - role: upload-afs-roots
       afs_target: "{{ afs.path }}/project-install-guide/{{ service_type_data.service_type }}"
       when: zuul_success | bool
     - role: destroy-afs-token
diff --git a/playbooks/publish/opendev-afs.yaml b/playbooks/publish/opendev-afs.yaml
index cbcca3cd93..62b19d4ce0 100644
--- a/playbooks/publish/opendev-afs.yaml
+++ b/playbooks/publish/opendev-afs.yaml
@@ -2,7 +2,7 @@
   roles:
     - role: create-afs-token
       when: zuul_success | bool
-    - role: upload-afs
+    - role: upload-afs-roots
       afs_target: "/afs/.openstack.org/project/opendev.org/www{{ afs_subpath | default('') }}"
       when: zuul_success | bool
     - role: destroy-afs-token
diff --git a/playbooks/publish/openstack-afs.yaml b/playbooks/publish/openstack-afs.yaml
index 85bbab76ed..c31cf1d892 100644
--- a/playbooks/publish/openstack-afs.yaml
+++ b/playbooks/publish/openstack-afs.yaml
@@ -16,7 +16,7 @@
   roles:
     - role: create-afs-token
       when: zuul_success | bool
-    - role: upload-afs
+    - role: upload-afs-roots
       afs_target: "{{ afs.path }}{{ our_afs_subpath }}"
       when: zuul_success | bool
     - role: destroy-afs-token
diff --git a/playbooks/publish/starlingx-afs.yaml b/playbooks/publish/starlingx-afs.yaml
index 7c0c04cb39..04ed2dd1bf 100644
--- a/playbooks/publish/starlingx-afs.yaml
+++ b/playbooks/publish/starlingx-afs.yaml
@@ -2,7 +2,7 @@
   roles:
     - role: create-afs-token
       when: zuul_success | bool
-    - role: upload-afs
+    - role: upload-afs-roots
       afs_target: "/afs/.openstack.org/project/starlingx.io/www{{ afs_subpath | default('') }}"
       when: zuul_success | bool
     - role: destroy-afs-token
diff --git a/playbooks/publish/zuul-afs.yaml b/playbooks/publish/zuul-afs.yaml
index d39bba8db3..897e56da0a 100644
--- a/playbooks/publish/zuul-afs.yaml
+++ b/playbooks/publish/zuul-afs.yaml
@@ -2,7 +2,7 @@
   roles:
     - role: create-afs-token
       when: zuul_success | bool
-    - role: upload-afs
+    - role: upload-afs-roots
       afs_target: "/afs/.openstack.org/project/zuul-ci.org/www{{ afs_subpath | default('') }}"
       when: zuul_success | bool
     - role: destroy-afs-token