diff --git a/v2/devices/bacon.yml b/v2/devices/bacon.yml
index 771a9798..162eab78 100644
--- a/v2/devices/bacon.yml
+++ b/v2/devices/bacon.yml
@@ -60,14 +60,14 @@ operating_systems:
             - var: "bootstrap"
               value: true
             - OR:
-              - var: channel
-                value: ubports-touch/16.04/stable
-              - var: channel
-                value: 16.04/rc
-              - var: channel
-                value: 16.04/devel
-              - var: channel
-                value: 16.04/armhf/hybris/halium-devel
+                - var: channel
+                  value: ubports-touch/16.04/stable
+                - var: channel
+                  value: 16.04/rc
+                - var: channel
+                  value: 16.04/devel
+                - var: channel
+                  value: 16.04/armhf/hybris/halium-devel
 
       - actions:
           - core:download:
@@ -86,12 +86,12 @@ operating_systems:
             - var: "bootstrap"
               value: true
             - OR:
-              - var: channel
-                value: 20.04/armhf/android9plus/devel
-              - var: channel
-                value: 20.04/armhf/android9plus/rc
-              - var: channel
-                value: 20.04/armhf/android9plus/stable
+                - var: channel
+                  value: 20.04/armhf/android9plus/devel
+                - var: channel
+                  value: 20.04/armhf/android9plus/rc
+                - var: channel
+                  value: 20.04/armhf/android9plus/stable
 
       - actions:
           - adb:reboot:
@@ -116,14 +116,14 @@ operating_systems:
             - var: "bootstrap"
               value: true
             - OR:
-              - var: channel
-                value: ubports-touch/16.04/stable
-              - var: channel
-                value: 16.04/rc
-              - var: channel
-                value: 16.04/devel
-              - var: channel
-                value: 16.04/armhf/hybris/halium-devel
+                - var: channel
+                  value: ubports-touch/16.04/stable
+                - var: channel
+                  value: 16.04/rc
+                - var: channel
+                  value: 16.04/devel
+                - var: channel
+                  value: 16.04/armhf/hybris/halium-devel
 
       - actions:
           - fastboot:flash:
@@ -139,12 +139,12 @@ operating_systems:
             - var: "bootstrap"
               value: true
             - OR:
-              - var: channel
-                value: 20.04/armhf/android9plus/devel   
-              - var: channel
-                value: 20.04/armhf/android9plus/rc
-              - var: channel
-                value: 20.04/armhf/android9plus/stable
+                - var: channel
+                  value: 20.04/armhf/android9plus/devel
+                - var: channel
+                  value: 20.04/armhf/android9plus/rc
+                - var: channel
+                  value: 20.04/armhf/android9plus/stable
 
       - actions:
           - fastboot:erase:
diff --git a/v2/devices/miatoll.yml b/v2/devices/miatoll.yml
index a73d0af3..e3da87b6 100644
--- a/v2/devices/miatoll.yml
+++ b/v2/devices/miatoll.yml
@@ -117,12 +117,12 @@ operating_systems:
                   group: "firmware"
         condition:
           var: "bootstrap"
-          value: true  
+          value: true
       - actions:
           - fastboot:reboot_fastboot:
         condition:
-          var: "partition"  
-          value: true                      
+          var: "partition"
+          value: true
       - actions:
           # Increase space for system_a for UT installation
           - fastboot:resize_logical_partition:
@@ -237,4 +237,3 @@ operating_systems:
       - actions:
           - fastboot:reboot:
     slideshow: []
-
diff --git a/v2/devices/mimameid.yml b/v2/devices/mimameid.yml
index 9f80a917..26a59b01 100644
--- a/v2/devices/mimameid.yml
+++ b/v2/devices/mimameid.yml
@@ -104,7 +104,7 @@ operating_systems:
                 - partition: "vbmeta_a"
                   file: "unpacked/vbmeta.img"
                   group: "firmware"
-                  flags: [ "--disable-verity" ]
+                  flags: ["--disable-verity"]
                 - partition: "super"
                   file: "unpacked/super.img"
                   group: "firmware"
diff --git a/v2/devices/vidofnir.yml b/v2/devices/vidofnir.yml
index 4f91a797..23981e9b 100644
--- a/v2/devices/vidofnir.yml
+++ b/v2/devices/vidofnir.yml
@@ -95,7 +95,7 @@ operating_systems:
                 - partition: "vbmeta_a"
                   file: "unpacked/vbmeta.img"
                   group: "firmware"
-                  flags: [ "--disable-verity" ]
+                  flags: ["--disable-verity"]
                 - partition: "super"
                   file: "unpacked/super.img"
                   group: "firmware"