diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index bdea96f4df..258ae5041c 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -181,7 +181,8 @@ outputs:
               fi
             done
             echo "(cellv2) Running host discovery..."
-            su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 discover_hosts --verbose"
+            su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 discover_hosts --by-service --verbose"
+
         nova_api_ensure_default_cell.sh:
           mode: "0700"
           content: |
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index eb89851ee7..853145fa61 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -60,6 +60,7 @@ outputs:
     description: Role data for the Nova Compute service.
     value:
       service_name: {get_attr: [NovaIronicBase, role_data, service_name]}
+      cellv2_discovery: true
       config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
       logging_source: {get_attr: [NovaIronicBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaIronicBase, role_data, logging_groups]}
diff --git a/environments/services-docker/ironic.yaml b/environments/services-docker/ironic.yaml
index d98ca1d467..e927ecb32f 100644
--- a/environments/services-docker/ironic.yaml
+++ b/environments/services-docker/ironic.yaml
@@ -3,5 +3,3 @@ resource_registry:
   OS::TripleO::Services::IronicConductor: ../../docker/services/ironic-conductor.yaml
   OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
   OS::TripleO::Services::NovaIronic: ../../docker/services/nova-ironic.yaml
-parameter_defaults:
-  NovaSchedulerDiscoverHostsInCellsInterval: 15