diff --git a/ansible/inventory/group_vars/all/inspector b/ansible/inventory/group_vars/all/inspector
index 81b3f51e0..5b0272e70 100644
--- a/ansible/inventory/group_vars/all/inspector
+++ b/ansible/inventory/group_vars/all/inspector
@@ -413,7 +413,7 @@ inspector_dell_switch_lldp_workaround_group:
 # data which may be useful in environments without Swift.
 
 # Whether the inspection data store is enabled.
-inspector_store_enabled: "{{ kolla_enable_ironic | bool and not kolla_enable_swift | bool }}"
+inspector_store_enabled: "{{ kolla_enable_ironic_inspector | bool and not kolla_enable_swift | bool }}"
 
 # Port on which the inspection data store should listen.
 inspector_store_port: 8080
diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla
index 255ffa242..112bb737c 100644
--- a/ansible/inventory/group_vars/all/kolla
+++ b/ansible/inventory/group_vars/all/kolla
@@ -535,6 +535,7 @@ kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_influxdb: "{{ kolla_enable_cloudkitty | bool }}"
 kolla_enable_ironic: "no"
+kolla_enable_ironic_inspector: "{{ kolla_enable_ironic | bool }}"
 kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}"
 kolla_enable_iscsid: "{{ kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool }}"
 kolla_enable_kuryr: "no"
diff --git a/ansible/overcloud-introspection-rules.yml b/ansible/overcloud-introspection-rules.yml
index 5a5baaa3b..6f460968f 100644
--- a/ansible/overcloud-introspection-rules.yml
+++ b/ansible/overcloud-introspection-rules.yml
@@ -5,9 +5,9 @@
   tags:
     - introspection-rules
   tasks:
-    - name: Create controllers group with ironic enabled
+    - name: Create controllers group with ironic inspector enabled
       group_by:
-        key: "controllers_for_introspection_rules_{{ kolla_enable_ironic | bool }}"
+        key: "controllers_for_introspection_rules_{{ kolla_enable_ironic_inspector | bool }}"
       changed_when: false
 
 - name: Ensure introspection rules are registered in Ironic Inspector
diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml
index 607d7945e..bef29ad3b 100644
--- a/ansible/roles/kolla-ansible/tests/test-extras.yml
+++ b/ansible/roles/kolla-ansible/tests/test-extras.yml
@@ -165,6 +165,7 @@
             kolla_enable_horizon: True
             kolla_enable_influxdb: True
             kolla_enable_ironic: True
+            kolla_enable_ironic_inspector: True
             kolla_enable_ironic_neutron_agent: True
             kolla_enable_kuryr: True
             kolla_enable_magnum: True
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index 2ab0f9d95..750e13609 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -139,6 +139,7 @@ kolla_feature_flags:
   - horizon_zun
   - influxdb
   - ironic
+  - ironic_inspector
   - ironic_neutron_agent
   - ironic_prometheus_exporter
   - iscsid
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 8cd251cb4..63b7856c1 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -92,9 +92,9 @@ kolla_openstack_custom_config_include_globs_default:
     glob: horizon/**
   - enabled: '{{ kolla_enable_influxdb | bool }}'
     glob: influx*
-  - enabled: '{{ kolla_enable_ironic | bool }}'
+  - enabled: '{{ kolla_enable_ironic_inspector | bool }}'
     glob: ironic-inspector.conf
-  - enabled: '{{ kolla_enable_ironic | bool }}'
+  - enabled: '{{ kolla_enable_ironic_inspector | bool }}'
     glob: ironic-inspector/**
   - enabled: '{{ kolla_enable_ironic | bool }}'
     glob: ironic.conf
@@ -564,6 +564,9 @@ kolla_extra_ironic:
 ###############################################################################
 # Ironic inspector configuration.
 
+# Whether to enable Ironic inspector.
+kolla_enable_ironic_inspector: "{{ kolla_enable_ironic | bool }}"
+
 # Comma-separated list of inspector processing plugins.
 kolla_inspector_processing_hooks:
 
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 827c60712..df44161d8 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -342,6 +342,7 @@
 #kolla_enable_horizon_zun:
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
+#kolla_enable_ironic_inspector:
 #kolla_enable_ironic_neutron_agent:
 #kolla_enable_ironic_prometheus_exporter:
 #kolla_enable_iscsid:
diff --git a/releasenotes/notes/adds-kolla-enable-ironic-inspector-5db384e4f94386c3.yaml b/releasenotes/notes/adds-kolla-enable-ironic-inspector-5db384e4f94386c3.yaml
new file mode 100644
index 000000000..f4a6ff690
--- /dev/null
+++ b/releasenotes/notes/adds-kolla-enable-ironic-inspector-5db384e4f94386c3.yaml
@@ -0,0 +1,10 @@
+---
+features:
+  - |
+    Adds the kolla feature flag: ``kolla_enable_ironic_inspector``. This
+    defaults to ``true`` if you have enabled Ironic as Kayobe makes extensive
+    use of introspection rules.  Please note that whilst ironic inspector is
+    deprecated, some features, such as introspection rules are not currently
+    implemented in the replacement implementation built-in to Ironic.  See
+    :ironic-doc:`Ironic documentation <admin/inspection/migration.html>` for
+    more details.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 10d413c14..5c1cfeaee 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -255,4 +255,5 @@ openstackdocs_auto_name = False
 
 openstackdocs_projects = [
     'kayobe',
+    'ironic',
 ]