diff --git a/playbooks/kayobe-base/pre.yml b/playbooks/kayobe-base/pre.yml
index b6e7db53be696f12c1fcdad85262dd8e4de7419c..18f7b15276523af2699254148b0bc76e4b19d667 100644
--- a/playbooks/kayobe-base/pre.yml
+++ b/playbooks/kayobe-base/pre.yml
@@ -6,6 +6,24 @@
       # Ensure that facts are referenced via ansible_facts.<fact>.
       inject_facts_as_vars = False
 
+      # Test with fact caching enabled
+      gathering = smart
+      fact_caching = jsonfile
+      fact_caching_connection = /tmp/kayobe-facts
+
+      [ssh_connection]
+      pipelining = True
+      retries = 3
+    ansible_cfg_kolla: |
+      [defaults]
+      # Ensure that facts are referenced via ansible_facts.<fact>.
+      inject_facts_as_vars = False
+
+      # Test with fact caching enabled
+      gathering = smart
+      fact_caching = jsonfile
+      fact_caching_connection = /tmp/kolla-ansible-facts
+
       [ssh_connection]
       pipelining = True
       retries = 3
@@ -31,11 +49,16 @@
         line: "export KAYOBE_EXTRA_ARGS=-vvv"
         regexp: "^#export KAYOBE_EXTRA_ARGS=$"
 
-    - name: Ensure ansible.cfg exists
+    - name: Ensure ansible.cfg exists for Kayobe
       copy:
         content: "{{ ansible_cfg }}"
         dest: "{{ kayobe_config_src_dir }}/etc/kayobe/ansible.cfg"
 
+    - name: Ensure ansible.cfg exists for Kolla Ansible
+      copy:
+        content: "{{ ansible_cfg_kolla }}"
+        dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/ansible.cfg"
+
     - name: Update kayobe requirements.yml
       include_role:
         name: kayobe-galaxy-requirements