diff --git a/roles/simulate-fabric/files/simulate-fabric-playbook.yml b/roles/simulate-fabric/files/simulate-fabric-playbook.yml
index 60359a3..9ff2345 100644
--- a/roles/simulate-fabric/files/simulate-fabric-playbook.yml
+++ b/roles/simulate-fabric/files/simulate-fabric-playbook.yml
@@ -17,7 +17,7 @@
        - bridge-utils
 
     - name: Create bridges
-      when: "ansible_interfaces[item.name] is not defined"
+      when: "ansible_{{ item.name }} is not defined"
       command: brctl addbr "{{ item.name }}"
       with_items: "{{ simfabric_bridges }}"
 
diff --git a/roles/simulate-fabric/templates/simulate-fabric-vars.yml.j2 b/roles/simulate-fabric/templates/simulate-fabric-vars.yml.j2
index 84a74b7..b129297 100644
--- a/roles/simulate-fabric/templates/simulate-fabric-vars.yml.j2
+++ b/roles/simulate-fabric/templates/simulate-fabric-vars.yml.j2
@@ -1,6 +1,8 @@
 ---
 
-simfabric_bridges: {{ simfabric_bridges | to_yaml }}
+simfabric_bridges:
+{{ simfabric_bridges | to_nice_yaml }}
 
-simfabric_interfaces: {{ simfabric_interfaces | to_yaml }}
+simfabric_interfaces:
+{{ simfabric_interfaces | to_nice_yaml }}