diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index 9016c844d1..f8f9744b97 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -125,10 +125,16 @@ outputs:
                   # into openshift-ansible but it's not been released yet.
                   # This code will go away as soon as an rpm with the required
                   # roles hits the repo.
-                  - name: Install NetworkManager
+                  - name: OpenShift networking preparation
                     hosts: all
 
                     tasks:
+                      - name: Stop and disable OVS on bare metal
+                        service:
+                          name: openvswitch
+                          state: stopped
+                          enabled: no
+
                       - name: install NetworkManager
                         package:
                           name: NetworkManager