diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml
index 0399c75..0b910b3 100644
--- a/playbooks/base-test/post-logs.yaml
+++ b/playbooks/base-test/post-logs.yaml
@@ -13,8 +13,9 @@
       set_fact:
         _swift_provider_name: "{{ opendev_base_item }}"
       with_random_choice:
-        - 'ovh_bhs'
-        - 'ovh_gra'
+        # Only rax to test if keystone is happy again
+        # - 'ovh_bhs'
+        # - 'ovh_gra'
         - 'rax_dfw'
         - 'rax_iad'
         - 'rax_ord'
diff --git a/playbooks/base/post-logs.yaml b/playbooks/base/post-logs.yaml
index a410c2d..7ba8bca 100644
--- a/playbooks/base/post-logs.yaml
+++ b/playbooks/base/post-logs.yaml
@@ -14,9 +14,10 @@
       with_random_choice:
         - 'ovh_bhs'
         - 'ovh_gra'
-        - 'rax_dfw'
-        - 'rax_iad'
-        - 'rax_ord'
+        # Remove rax due to keystone problems
+        # - 'rax_dfw'
+        # - 'rax_iad'
+        # - 'rax_ord'
       loop_control:
         loop_var: 'opendev_base_item'
     - name: Upload swift logs to {{ _swift_provider_name }}