diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 40d1aa51f5..c0229ab496 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.3.24
+version: 0.3.25
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/bin/_nova-compute.sh.tpl b/nova/templates/bin/_nova-compute.sh.tpl
index 23ce3475f3..702e3b9211 100644
--- a/nova/templates/bin/_nova-compute.sh.tpl
+++ b/nova/templates/bin/_nova-compute.sh.tpl
@@ -18,9 +18,15 @@ set -ex
 
 exec nova-compute \
       --config-file /etc/nova/nova.conf \
+{{- if .Values.console.address_search_enabled }}
       --config-file /tmp/pod-shared/nova-console.conf \
+{{- end }}
+{{- if .Values.conf.libvirt.address_search_enabled }}
       --config-file /tmp/pod-shared/nova-libvirt.conf \
+{{- end }}
 {{- if and ( empty .Values.conf.nova.DEFAULT.host ) ( .Values.pod.use_fqdn.compute ) }}
       --config-file /tmp/pod-shared/nova-compute-fqdn.conf \
 {{- end }}
+{{- if .Values.conf.hypervisor.address_search_enabled }}
       --config-file /tmp/pod-shared/nova-hypervisor.conf
+{{- end }}
diff --git a/nova/values.yaml b/nova/values.yaml
index 5e0ad1978b..7a05ff12ac 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -503,6 +503,7 @@ console:
     vncproxy:
       # IF blank, search default routing interface
       vncserver_proxyclient_interface:
+  address_search_enabled: true
 
 ceph_client:
   configmap: ceph-etc
@@ -1338,10 +1339,13 @@ conf:
       cpu_allocation_ratio: 1.0
       reserved_host_memory_mb: 0
   libvirt:
-    # Get the IP address to be used as the target for live migration traffic using interface name.
+    address_search_enabled: true
+    # When "address_search_enabled", get the IP address to be used as the target for live migration
+    # traffic using interface name.
     # If this option is set to None, the hostname of the migration target compute node will be used.
     live_migration_interface:
   hypervisor:
+    address_search_enabled: true
     # my_ip can be set automatically through this interface name.
     host_interface:
   # This list is the keys to exclude from the config file ingested by nova-compute
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 7b89c00068..4b9c46b2f5 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -93,4 +93,5 @@ nova:
   - 0.3.22 Replace deprecated configuration vncserver_proxyclient_address to server_proxyclient_address
   - 0.3.23 Add Ubuntu Jammy overrides
   - 0.3.24 Create a certificate for novnc vencrypt separately
+  - 0.3.25 Add IP addresses search control flag
 ...