diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml
index 0beff84..018ab4f 100644
--- a/playbooks/base-test/post-logs.yaml
+++ b/playbooks/base-test/post-logs.yaml
@@ -8,24 +8,27 @@
         name: local-log-download
       vars:
         local_log_download_api: 'https://zuul.opendev.org/api/tenant/{{ zuul.tenant }}'
-    - name: Include upload logs role
+    - name: Select random swift provider for logs upload
+      set_fact:
+        _swift_provider_name: "{{ item }}"
+      with_random_choice:
+        - 'ovh_bhs'
+        - 'ovh_gra'
+        - 'rax_dfw'
+        - 'rax_iad'
+        - 'rax_ord'
+    - name: Upload swift logs to {{ _swift_provider_name }}
       no_log: true
       include_role:
         name: upload-logs-swift
       vars:
         zuul_log_path_shard_build: true
-        zuul_log_cloud_config: '{{ item }}'
+        zuul_log_cloud_config: "{{ lookup('ansible.builtin.vars', 'opendev_cloud_' ~ _swift_provider_name) }}"
         zuul_log_partition: true
         zuul_log_delete_after: 2592000
         # Unique log prefix to avoid container name collisions when ceph is
         # used.
         zuul_log_container: zuul_opendev_logs
-      with_random_choice:
-        - '{{ opendev_cloud_ovh_bhs }}'
-        - '{{ opendev_cloud_ovh_gra }}'
-        - '{{ opendev_cloud_rax_dfw }}'
-        - '{{ opendev_cloud_rax_iad }}'
-        - '{{ opendev_cloud_rax_ord }}'
     # NOTE(ianw): file generated by local-log-download, upload_results
     # is registered by the upload-logs-swift role
     - name: Register quick-download link