diff --git a/dev/functions b/dev/functions
index 8614897d06e06384af70f928ebdaba8306eaa724..8dbaaee85a46a07f2506bd79066285ab891e4327 100644
--- a/dev/functions
+++ b/dev/functions
@@ -436,7 +436,8 @@ function overcloud_deploy {
         run_kayobe kolla ansible run certificates \
           --kolla-extra kolla_certificates_dir=${KAYOBE_CONFIG_PATH}/kolla/certificates \
           --kolla-extra ansible_user=$USER \
-          --kolla-extra ansible_python_interpreter=/usr/bin/python3
+          --kolla-extra ansible_python_interpreter=/usr/bin/python3 \
+          --skip-tags kolla-openstack
         unset ANSIBLE_CACHE_PLUGIN
 
         # Add CA cert to trust store.
diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py
index 464d83b0ed763b3556e09d55f6078dc05b16254e..4332953293bf003b0af3df1e4bfeb91222c55b98 100644
--- a/kayobe/cli/commands.py
+++ b/kayobe/cli/commands.py
@@ -373,6 +373,11 @@ class KollaAnsibleRun(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
 
     def take_action(self, parsed_args):
         self.app.LOG.debug("Running Kolla Ansible command")
+
+        # First prepare configuration.
+        self.generate_kolla_ansible_config(parsed_args)
+
+        # Run the kolla-ansible command.
         self.run_kolla_ansible(parsed_args, parsed_args.command,
                                parsed_args.kolla_inventory_filename)
 
diff --git a/releasenotes/notes/generate-ka-config-on-ka-run-8ff96b27017b2c62.yaml b/releasenotes/notes/generate-ka-config-on-ka-run-8ff96b27017b2c62.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..eef8cd394dc71abb25ea7dfb960d02191efe7e54
--- /dev/null
+++ b/releasenotes/notes/generate-ka-config-on-ka-run-8ff96b27017b2c62.yaml
@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    ``kayobe kolla ansible run`` will now generate Kolla-Ansible configuration
+    before the command is run. You can use ``--skip-tags kolla-openstack`` to
+    skip this for commands that do not require the kolla config.
+upgrade:
+  - |
+    ``kayobe kolla ansible run`` will now generate Kolla-Ansible configuration
+    before the command is run. You can use ``--skip-tags kolla-openstack`` to
+    skip this for commands that do not require the kolla config.