diff --git a/handlers/main.yml b/handlers/main.yml
index 949dc5a5..b5656c67 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -141,7 +141,20 @@
     state: started
 
 # (NOTE) Restarting twice to cleanup some pid.
-- name: restart ovn service
+- name: Restart ovn northd
   service:
     name: "{{ neutron_ovn_northd_service_name }}"
     state: restarted
+  when:
+    - neutron_services['neutron-ovn-northd']['group'] in group_names and neutron_plugin_type == 'ml2.ovn'
+  listen:
+    - restart ovn service
+
+- name: Restart ovn controller
+  service:
+    name: "{{ neutron_ovn_controller_service_name }}"
+    state: restarted
+  when:
+    - neutron_services['neutron-ovn-controller']['group'] in group_names and neutron_plugin_type == 'ml2.ovn'
+  listen:
+    - restart ovn service
diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml
index ca9a3541..7a69b062 100644
--- a/tasks/neutron_install.yml
+++ b/tasks/neutron_install.yml
@@ -39,6 +39,7 @@
   notify:
     - "Restart neutron services"
     - "Restart provider services"
+    - "restart ovn service"
 
 - name: Remove known problem packages
   package: