diff --git a/roles/ovn/vars/main.yml b/roles/ovn/vars/main.yml
index f03bd3b..994894f 100644
--- a/roles/ovn/vars/main.yml
+++ b/roles/ovn/vars/main.yml
@@ -25,8 +25,8 @@
     ovn_northd:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
-    ovn_controller:
-      node_selector_key: openstack-compute-node
+    ovn_controller_gw:
+      node_selector_key: openstack-control-plane
       node_selector_value: enabled
   volume:
     ovn_ovsdb_nb:
@@ -34,12 +34,6 @@
     ovn_ovsdb_sb:
       size: 20Gi
   pod:
-    labels:
-      ovn_controller_gw:
-        type: gw
-      ovn_controller:
-        type: hv
-
     replicas:
       ovn_ovsdb_nb: 3
       ovn_ovsdb_sb: 3