diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml
index 50edba7867..9f4b1de35f 100644
--- a/deployment/ovn/ovn-controller-container-puppet.yaml
+++ b/deployment/ovn/ovn-controller-container-puppet.yaml
@@ -294,4 +294,18 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      upgrade_tasks: []
+      upgrade_tasks:
+        - name: Switch ovn remote setting
+          tags:
+            - never
+            - nova_hybrid_state
+          when: step|int == 0
+          block:
+            - name: Get ovn remote setting
+              shell: |
+                ovs-vsctl get open . external_ids:ovn-remote
+              register: ovn_remote
+            - name: Set new ovn remote setting
+              shell: |
+                ovs-vsctl set open . external_ids:ovn-remote="tcp:{{ ovn_dbs_vip | ipwrap }}:6642"
+              when: ovn_dbs_vip not in ovn_remote.stdout