diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b73313a..6c8ceb3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
-      - id: check-byte-order-marker
+      - id: fix-byte-order-marker
       - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
diff --git a/roles/multi-node-setup/tasks/main.yaml b/roles/multi-node-setup/tasks/main.yaml
index fc6bd6b..ee67fda 100644
--- a/roles/multi-node-setup/tasks/main.yaml
+++ b/roles/multi-node-setup/tasks/main.yaml
@@ -5,17 +5,15 @@
   block:
     - name: Ensure the infra bridge exists
       become: true
-      openvswitch_bridge:
-        bridge: "{{ infra_bridge_name }}"
-        state: present
-        fail_mode: standalone
+      command: >-
+        ovs-vsctl --may-exist add-br {{ infra_bridge_name }}
+          -- set-fail-mode {{ infra_bridge_name }} standalone
 
     - name: Ensure the Neutron external bridge exists
       become: true
-      openvswitch_bridge:
-        bridge: "{{ neutron_external_bridge_name }}"
-        state: present
-        fail_mode: standalone
+      command: >-
+        ovs-vsctl --may-exist add-br {{ neutron_external_bridge_name }}
+          -- set-fail-mode {{ neutron_external_bridge_name }} standalone
 
     - name: Create patch port between bridges
       become: true