diff --git a/ansible/install/browbeat.yml b/ansible/install/browbeat.yml
index 387b5e8bd..762b787ad 100644
--- a/ansible/install/browbeat.yml
+++ b/ansible/install/browbeat.yml
@@ -7,6 +7,7 @@
   remote_user: "{{ browbeat_user }}"
   roles:
     - common
+    - osp_version
     - browbeat
     - stockpile
     - { role: browbeat-results, when: browbeat_results_in_httpd}
diff --git a/ansible/install/roles/rally/tasks/main.yml b/ansible/install/roles/rally/tasks/main.yml
index 1befab4a3..5665affbd 100644
--- a/ansible/install/roles/rally/tasks/main.yml
+++ b/ansible/install/roles/rally/tasks/main.yml
@@ -55,6 +55,13 @@
         regexp: "{{ os_auth_url.stdout }}"
         replace: '{{ os_auth_url.stdout }}/v3'
 
+    - name: Add OS_CACERT to undercloudrc
+      lineinfile:
+        path: "{{home_dir}}/undercloudrc"
+        insertafter: "export OS_USER"
+        line: "export OS_CACERT=/etc/pki/ca-trust/source/anchors/undercloud-cacert.pem"
+      when: rhosp_version is version('15.0', '>=')
+
     - name: Setup rally deployment for undercloud
       shell: . {{ rally_venv }}/bin/activate; . "{{home_dir}}/undercloudrc"; rally deployment create --fromenv --name undercloud