diff --git a/.editorconfig b/.editorconfig
index 21f12ed..4a4080a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,6 @@
-# Config for shfmt
-[{gen/regenerate-meson,gen/run-ci}]
+[*]
 indent_style = space
 indent_size = 4
+# Config for shfmt
 switch_case_indent = true
 space_redirects = true
diff --git a/yaml/org/open_power/Common/Callout.metadata.yaml b/yaml/org/open_power/Common/Callout.metadata.yaml
index 00e2067..56fc740 100644
--- a/yaml/org/open_power/Common/Callout.metadata.yaml
+++ b/yaml/org/open_power/Common/Callout.metadata.yaml
@@ -1,4 +1,4 @@
 - name: Procedure
   meta:
-    - str: "PROCEDURE=%u"
-      type: uint32
+      - str: "PROCEDURE=%u"
+        type: uint32
diff --git a/yaml/org/open_power/Host.metadata.yaml b/yaml/org/open_power/Host.metadata.yaml
index 8fd8870..ffca151 100644
--- a/yaml/org/open_power/Host.metadata.yaml
+++ b/yaml/org/open_power/Host.metadata.yaml
@@ -1,15 +1,15 @@
 - name: Event
   level: ERR
   meta:
-    - str: "ESEL=%s"
-      type: string
+      - str: "ESEL=%s"
+        type: string
   inherits:
-    - xyz.openbmc_project.Common.Callout.Inventory
+      - xyz.openbmc_project.Common.Callout.Inventory
 
 - name: MaintenanceProcedure
   level: ERR
   meta:
-    - str: "ESEL=%s"
-      type: string
+      - str: "ESEL=%s"
+        type: string
   inherits:
-    - org.open_power.Common.Callout.Procedure
+      - org.open_power.Common.Callout.Procedure
diff --git a/yaml/org/open_power/Host/Access.metadata.yaml b/yaml/org/open_power/Host/Access.metadata.yaml
index f263858..37a3943 100644
--- a/yaml/org/open_power/Host/Access.metadata.yaml
+++ b/yaml/org/open_power/Host/Access.metadata.yaml
@@ -1,13 +1,13 @@
 - name: WriteCFAM
   meta:
-    - str: "ADDRESS=0x%X"
-      type: uint32
+      - str: "ADDRESS=0x%X"
+        type: uint32
   inherits:
-    - xyz.openbmc_project.Common.Callout.Device
+      - xyz.openbmc_project.Common.Callout.Device
 
 - name: ReadCFAM
   meta:
-    - str: "ADDRESS=0x%X"
-      type: uint32
+      - str: "ADDRESS=0x%X"
+        type: uint32
   inherits:
-    - xyz.openbmc_project.Common.Callout.Device
+      - xyz.openbmc_project.Common.Callout.Device
diff --git a/yaml/org/open_power/Proc/FSI.metadata.yaml b/yaml/org/open_power/Proc/FSI.metadata.yaml
index 6a202f3..a84780f 100644
--- a/yaml/org/open_power/Proc/FSI.metadata.yaml
+++ b/yaml/org/open_power/Proc/FSI.metadata.yaml
@@ -1,8 +1,8 @@
 - name: MasterDetectionFailure
   inherits:
-    - xyz.openbmc_project.Common.Callout.Device
+      - xyz.openbmc_project.Common.Callout.Device
 
 - name: SlaveDetectionFailure
   meta:
-    - str: "ERRNO=%d"
-      type: int32
+      - str: "ERRNO=%d"
+        type: int32
diff --git a/yaml/xyz/openbmc_project/BIOSConfig/Common.metadata.yaml b/yaml/xyz/openbmc_project/BIOSConfig/Common.metadata.yaml
index 5654021..e210158 100644
--- a/yaml/xyz/openbmc_project/BIOSConfig/Common.metadata.yaml
+++ b/yaml/xyz/openbmc_project/BIOSConfig/Common.metadata.yaml
@@ -3,20 +3,20 @@
 - name: AttributeSettingFailed
   level: ERR
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
 - name: AttributeReadOnly
   level: ERR
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
 - name: NoResource
   level: ERR
 - name: InvalidValue
   level: ERR
   meta:
-    - str: "UNSUPPORTED_VALUE=%s"
-      type: string
+      - str: "UNSUPPORTED_VALUE=%s"
+        type: string
 - name: InvalidCurrentPassword
   level: ERR
 - name: PasswordNotSettable
diff --git a/yaml/xyz/openbmc_project/Certs.metadata.yaml b/yaml/xyz/openbmc_project/Certs.metadata.yaml
index bdb77a8..8b4185e 100644
--- a/yaml/xyz/openbmc_project/Certs.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Certs.metadata.yaml
@@ -1,4 +1,4 @@
 - name: InvalidCertificate
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/Chassis/Common.errors.yaml b/yaml/xyz/openbmc_project/Chassis/Common.errors.yaml
index 2df3649..f540a1b 100644
--- a/yaml/xyz/openbmc_project/Chassis/Common.errors.yaml
+++ b/yaml/xyz/openbmc_project/Chassis/Common.errors.yaml
@@ -1,6 +1,6 @@
 - name: UnsupportedCommand
   description: >
-    An unsupported command was attempted.
+      An unsupported command was attempted.
 - name: IOError
   description: >
-    An IO error occurred.
+      An IO error occurred.
diff --git a/yaml/xyz/openbmc_project/Common.metadata.yaml b/yaml/xyz/openbmc_project/Common.metadata.yaml
index 13213a6..bb9b358 100644
--- a/yaml/xyz/openbmc_project/Common.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Common.metadata.yaml
@@ -1,13 +1,13 @@
 - name: Timeout
   meta:
-    - str: "TIMEOUT_IN_MSEC=%llu"
-      type: uint64
+      - str: "TIMEOUT_IN_MSEC=%llu"
+        type: uint64
 - name: InvalidArgument
   meta:
-    - str: "ARGUMENT_NAME=%s"
-      type: string
-    - str: "ARGUMENT_VALUE=%s"
-      type: string
+      - str: "ARGUMENT_NAME=%s"
+        type: string
+      - str: "ARGUMENT_VALUE=%s"
+        type: string
 - name: InternalFailure
   level: ERR
 - name: InsufficientPermission
@@ -15,8 +15,8 @@
 - name: NotAllowed
   level: INFO
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
 - name: NoCACertificate
   level: ERR
 - name: TooManyResources
@@ -24,10 +24,10 @@
 - name: ResourceNotFound
   level: INFO
   meta:
-    - str: "RESOURCE=%s"
-      type: string
+      - str: "RESOURCE=%s"
+        type: string
 - name: UnsupportedRequest
   level: INFO
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/Common/Device.metadata.yaml b/yaml/xyz/openbmc_project/Common/Device.metadata.yaml
index e8a95b1..ccef8a5 100644
--- a/yaml/xyz/openbmc_project/Common/Device.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Common/Device.metadata.yaml
@@ -1,7 +1,7 @@
 - name: ReadFailure
   inherits:
-    - xyz.openbmc_project.Common.Callout.Device
+      - xyz.openbmc_project.Common.Callout.Device
 
 - name: WriteFailure
   inherits:
-    - xyz.openbmc_project.Common.Callout.Device
+      - xyz.openbmc_project.Common.Callout.Device
diff --git a/yaml/xyz/openbmc_project/Common/File.metadata.yaml b/yaml/xyz/openbmc_project/Common/File.metadata.yaml
index 8a9ad02..a412ad7 100644
--- a/yaml/xyz/openbmc_project/Common/File.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Common/File.metadata.yaml
@@ -1,31 +1,31 @@
 - name: Open
   meta:
-    - str: "ERRNO=%d"
-      type: int32
-    - str: "PATH=%s"
-      type: string
+      - str: "ERRNO=%d"
+        type: int32
+      - str: "PATH=%s"
+        type: string
 
 - name: Seek
   meta:
-    - str: "OFFSET=%ll"
-      type: int64
-    - str: "WHENCE=%d"
-      type: int32
-    - str: "ERRNO=%d"
-      type: int32
-    - str: "PATH=%s"
-      type: string
+      - str: "OFFSET=%ll"
+        type: int64
+      - str: "WHENCE=%d"
+        type: int32
+      - str: "ERRNO=%d"
+        type: int32
+      - str: "PATH=%s"
+        type: string
 
 - name: Write
   meta:
-    - str: "ERRNO=%d"
-      type: int32
-    - str: "PATH=%s"
-      type: string
+      - str: "ERRNO=%d"
+        type: int32
+      - str: "PATH=%s"
+        type: string
 
 - name: Read
   meta:
-    - str: "ERRNO=%d"
-      type: int32
-    - str: "PATH=%s"
-      type: string
+      - str: "ERRNO=%d"
+        type: int32
+      - str: "PATH=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/Control/Device.metadata.yaml b/yaml/xyz/openbmc_project/Control/Device.metadata.yaml
index ea9229f..ba49108 100644
--- a/yaml/xyz/openbmc_project/Control/Device.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Control/Device.metadata.yaml
@@ -1,3 +1,3 @@
 - name: WriteFailure
   inherits:
-    - xyz.openbmc_project.Common.Callout.Device
+      - xyz.openbmc_project.Common.Callout.Device
diff --git a/yaml/xyz/openbmc_project/Dump/Create.metadata.yaml b/yaml/xyz/openbmc_project/Dump/Create.metadata.yaml
index 1644193..d6ad27f 100644
--- a/yaml/xyz/openbmc_project/Dump/Create.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Dump/Create.metadata.yaml
@@ -3,5 +3,5 @@
 
 - name: QuotaExceeded
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/Inventory.metadata.yaml b/yaml/xyz/openbmc_project/Inventory.metadata.yaml
index 1e3eb35..eea8326 100644
--- a/yaml/xyz/openbmc_project/Inventory.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Inventory.metadata.yaml
@@ -1,6 +1,6 @@
 - name: NotPresent
   inherits:
-    - xyz.openbmc_project.Common.Callout.Inventory
+      - xyz.openbmc_project.Common.Callout.Inventory
 - name: Nonfunctional
   inherits:
-    - xyz.openbmc_project.Common.Callout.Inventory
+      - xyz.openbmc_project.Common.Callout.Inventory
diff --git a/yaml/xyz/openbmc_project/Inventory/Connector/Embedded.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Connector/Embedded.interface.yaml
index c853a39..a419582 100644
--- a/yaml/xyz/openbmc_project/Inventory/Connector/Embedded.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Connector/Embedded.interface.yaml
@@ -1,5 +1,5 @@
 description: >
-  Implement to provide embedded connector attributes. An embedded component is
-  permanently incorporated into a larger component or device. This interface
-  shall not be used for parts that can be removed by a user or are considered
-  field-replaceable.
+    Implement to provide embedded connector attributes. An embedded component is
+    permanently incorporated into a larger component or device. This interface
+    shall not be used for parts that can be removed by a user or are considered
+    field-replaceable.
diff --git a/yaml/xyz/openbmc_project/Inventory/Connector/Slot.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Connector/Slot.interface.yaml
index bfaf9ad..e3c6855 100644
--- a/yaml/xyz/openbmc_project/Inventory/Connector/Slot.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Connector/Slot.interface.yaml
@@ -1,4 +1,4 @@
 description: >
-  Implement to provide slot connector attributes. An slot component is
-  a swappable component that can be removed by a user and considered
-  field-replaceable. The slot compoment represents a PCIe slot connections.
+    Implement to provide slot connector attributes. An slot component is
+    a swappable component that can be removed by a user and considered
+    field-replaceable. The slot compoment represents a PCIe slot connections.
diff --git a/yaml/xyz/openbmc_project/Inventory/Item/Drive.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item/Drive.interface.yaml
index 5796fe9..22ca8a4 100644
--- a/yaml/xyz/openbmc_project/Inventory/Item/Drive.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Item/Drive.interface.yaml
@@ -26,17 +26,15 @@
       default: Unknown
       type: enum[self.DriveLockState]
       description: >
-        Indicates if the data on the drive is accessible.
-        This does not correspond to write locked
+          Indicates if the data on the drive is accessible.
+          This does not correspond to write locked
     - name: PredictedMediaLifeLeftPercent
       default: maxint
       type: byte
       description: >
-        How much of the drives life is remaining in a percentage from 0-100 .
-        If the reading the value is not supported returns the max value for
-        the type (255).
-
-
+          How much of the drives life is remaining in a percentage from 0-100 .
+          If the reading the value is not supported returns the max value for
+          the type (255).
 
 enumerations:
     - name: DriveProtocol
diff --git a/yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml
index 96d6eb3..d0a2187 100644
--- a/yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml
@@ -306,6 +306,6 @@
           Objects that implement PCIeDevice can optionally implement the
           upstream_pcie_slot association to provide a link back to a PCIe slot.
       reverse_names:
-        - associated_pcie_device
+          - associated_pcie_device
       required_endpoint_interfaces:
-        - xyz.openbmc_project.Inventory.Item.PCIeSlot
+          - xyz.openbmc_project.Inventory.Item.PCIeSlot
diff --git a/yaml/xyz/openbmc_project/Logging/SEL.metadata.yaml b/yaml/xyz/openbmc_project/Logging/SEL.metadata.yaml
index 0c26e1f..50eed74 100755
--- a/yaml/xyz/openbmc_project/Logging/SEL.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Logging/SEL.metadata.yaml
@@ -1,13 +1,13 @@
 - name: Created
   level: INFO
   meta:
-    - str: "RECORD_TYPE=%u"
-      type: uint8
-    - str: "GENERATOR_ID=%u"
-      type: uint16
-    - str: "SENSOR_DATA=%s"
-      type: string
-    - str: "EVENT_DIR=%u"
-      type: uint8
-    - str: "SENSOR_PATH=%s"
-      type: string
+      - str: "RECORD_TYPE=%u"
+        type: uint8
+      - str: "GENERATOR_ID=%u"
+        type: uint16
+      - str: "SENSOR_DATA=%s"
+        type: string
+      - str: "EVENT_DIR=%u"
+        type: uint8
+      - str: "SENSOR_PATH=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/ScheduledTime.metadata.yaml b/yaml/xyz/openbmc_project/ScheduledTime.metadata.yaml
index 76dc582..5a539a2 100644
--- a/yaml/xyz/openbmc_project/ScheduledTime.metadata.yaml
+++ b/yaml/xyz/openbmc_project/ScheduledTime.metadata.yaml
@@ -1,5 +1,5 @@
 - name: InvalidTime
   level: ERR
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/Sensor/Device.metadata.yaml b/yaml/xyz/openbmc_project/Sensor/Device.metadata.yaml
index ff8fe53..1ae6a9f 100644
--- a/yaml/xyz/openbmc_project/Sensor/Device.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Sensor/Device.metadata.yaml
@@ -1,3 +1,3 @@
 - name: ReadFailure
   inherits:
-    - xyz.openbmc_project.Common.Callout.Device
+      - xyz.openbmc_project.Common.Callout.Device
diff --git a/yaml/xyz/openbmc_project/Sensor/Threshold.metadata.yaml b/yaml/xyz/openbmc_project/Sensor/Threshold.metadata.yaml
index 1ebaf51..651e9c7 100644
--- a/yaml/xyz/openbmc_project/Sensor/Threshold.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Sensor/Threshold.metadata.yaml
@@ -1,10 +1,10 @@
 - name: CriticalHigh
   level: ERR
   meta:
-    - str: "SENSOR_DATA=%s"
-      type: string
+      - str: "SENSOR_DATA=%s"
+        type: string
 - name: CriticalLow
   level: ERR
   meta:
-    - str: "SENSOR_DATA=%s"
-      type: string
+      - str: "SENSOR_DATA=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml b/yaml/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml
index d8b8708..ef20763 100644
--- a/yaml/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml
+++ b/yaml/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml
@@ -1,9 +1,9 @@
 - name: InvalidParameter
   description: >
-    An invalid parameter is attempted.
+      An invalid parameter is attempted.
 - name: UpdateInProgress
   description: >
-    Update is in progress.
+      Update is in progress.
 - name: InvalidId
   description: >
-    An invalid Id is attempted.
+      An invalid Id is attempted.
diff --git a/yaml/xyz/openbmc_project/Software/Settings.interface.yaml b/yaml/xyz/openbmc_project/Software/Settings.interface.yaml
index 52771df..0477cd8 100644
--- a/yaml/xyz/openbmc_project/Software/Settings.interface.yaml
+++ b/yaml/xyz/openbmc_project/Software/Settings.interface.yaml
@@ -1,11 +1,11 @@
 description: >
-  Implement to provide software settings management.
+    Implement to provide software settings management.
 
 properties:
-  - name: WriteProtected
-    type: boolean
-    default: false
-    description: >
-      This property shall indicate whether the software image can be
-      overwritten, where a value `true` shall indicate that the software cannot
-      be altered or overwritten.
+    - name: WriteProtected
+      type: boolean
+      default: false
+      description: >
+          This property shall indicate whether the software image can be
+          overwritten, where a value `true` shall indicate that the software cannot
+          be altered or overwritten.
diff --git a/yaml/xyz/openbmc_project/Software/Version.errors.yaml b/yaml/xyz/openbmc_project/Software/Version.errors.yaml
index 9840b30..8bb78cb 100644
--- a/yaml/xyz/openbmc_project/Software/Version.errors.yaml
+++ b/yaml/xyz/openbmc_project/Software/Version.errors.yaml
@@ -1,13 +1,13 @@
 - name: Incompatible
   description: >
-    A system component has a software version that is incompatible as determined
-    by the implementation and needs to be updated. Some usage examples for this
-    error include creating logging events and providing information on
-    implementation reactions such as when the system is prevented from powering
-    on if a minimum version level is not met.
+      A system component has a software version that is incompatible as determined
+      by the implementation and needs to be updated. Some usage examples for this
+      error include creating logging events and providing information on
+      implementation reactions such as when the system is prevented from powering
+      on if a minimum version level is not met.
 - name: AlreadyExists
   description: >
-    This image version already exists on the device
+      This image version already exists on the device
 - name: InvalidSignature
   description: >
-    Signature Validation failed for image version.
+      Signature Validation failed for image version.
diff --git a/yaml/xyz/openbmc_project/Software/Version.metadata.yaml b/yaml/xyz/openbmc_project/Software/Version.metadata.yaml
index 6550d0e..ee83920 100644
--- a/yaml/xyz/openbmc_project/Software/Version.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Software/Version.metadata.yaml
@@ -1,16 +1,16 @@
 - name: Incompatible
   level: ERR
   meta:
-    - str: "MIN_VERSION=%s"
-      type: string
-    - str: "ACTUAL_VERSION=%s"
-      type: string
-    - str: "VERSION_PURPOSE=%s"
-      type: string
+      - str: "MIN_VERSION=%s"
+        type: string
+      - str: "ACTUAL_VERSION=%s"
+        type: string
+      - str: "VERSION_PURPOSE=%s"
+        type: string
 - name: AlreadyExists
   level: ERR
   meta:
-    - str: "IMAGE_VERSION=%s"
-      type: string
+      - str: "IMAGE_VERSION=%s"
+        type: string
 - name: InvalidSignature
   level: ERR
diff --git a/yaml/xyz/openbmc_project/State/BMC.metadata.yaml b/yaml/xyz/openbmc_project/State/BMC.metadata.yaml
index 7b13f90..613d686 100644
--- a/yaml/xyz/openbmc_project/State/BMC.metadata.yaml
+++ b/yaml/xyz/openbmc_project/State/BMC.metadata.yaml
@@ -1,3 +1,3 @@
 - name: MultiUserTargetFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
diff --git a/yaml/xyz/openbmc_project/State/Chassis.metadata.yaml b/yaml/xyz/openbmc_project/State/Chassis.metadata.yaml
index bdc3375..bb08009 100644
--- a/yaml/xyz/openbmc_project/State/Chassis.metadata.yaml
+++ b/yaml/xyz/openbmc_project/State/Chassis.metadata.yaml
@@ -1,6 +1,6 @@
 - name: PowerOnFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
 - name: PowerOffFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
diff --git a/yaml/xyz/openbmc_project/State/Decorator/PowerSystemInputs.interface.yaml b/yaml/xyz/openbmc_project/State/Decorator/PowerSystemInputs.interface.yaml
index c8cb294..0dfefdd 100644
--- a/yaml/xyz/openbmc_project/State/Decorator/PowerSystemInputs.interface.yaml
+++ b/yaml/xyz/openbmc_project/State/Decorator/PowerSystemInputs.interface.yaml
@@ -9,19 +9,19 @@
       type: enum[self.Status]
       default: Good
       description: >
-        The current status of the power being supplied to the chassis.
+          The current status of the power being supplied to the chassis.
 
 enumerations:
-  - name: Status
-    description: >
-      Power status enum.
-    values:
-      - name: Fault
-        description: >
-         The power supply unit(s) are not providing enough power for normal
-         chassis operation, such as in a Brownout/Blackout condition where one
-         or more power supplies report AC loss VIN fault.
-      - name: Good
-        description: >
-         The power supply unit(s) are providing enough power for normal chassis
-         operation.
+    - name: Status
+      description: >
+          Power status enum.
+      values:
+          - name: Fault
+            description: >
+                The power supply unit(s) are not providing enough power for normal
+                chassis operation, such as in a Brownout/Blackout condition where one
+                or more power supplies report AC loss VIN fault.
+          - name: Good
+            description: >
+                The power supply unit(s) are providing enough power for normal chassis
+                operation.
diff --git a/yaml/xyz/openbmc_project/State/Host.metadata.yaml b/yaml/xyz/openbmc_project/State/Host.metadata.yaml
index c52c5c8..f691a02 100644
--- a/yaml/xyz/openbmc_project/State/Host.metadata.yaml
+++ b/yaml/xyz/openbmc_project/State/Host.metadata.yaml
@@ -1,18 +1,18 @@
 - name: SoftOffTimeout
   inherits:
-    - xyz.openbmc_project.Common.Timeout
+      - xyz.openbmc_project.Common.Timeout
 - name: HostStartFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
 - name: HostMinStartFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
 - name: HostShutdownFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
 - name: HostStopFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
 - name: HostRebootFailure
   inherits:
-    - xyz.openbmc_project.State.SystemdTarget.Failure
+      - xyz.openbmc_project.State.SystemdTarget.Failure
diff --git a/yaml/xyz/openbmc_project/State/SystemdTarget.metadata.yaml b/yaml/xyz/openbmc_project/State/SystemdTarget.metadata.yaml
index 2ef36e4..d8e363b 100644
--- a/yaml/xyz/openbmc_project/State/SystemdTarget.metadata.yaml
+++ b/yaml/xyz/openbmc_project/State/SystemdTarget.metadata.yaml
@@ -1,5 +1,5 @@
 - name: Failure
   level: ERR
   meta:
-    - str: "SYSTEMD_RESULT=%s"
-      type: string
+      - str: "SYSTEMD_RESULT=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/Time.metadata.yaml b/yaml/xyz/openbmc_project/Time.metadata.yaml
index cfef584..cb775ae 100644
--- a/yaml/xyz/openbmc_project/Time.metadata.yaml
+++ b/yaml/xyz/openbmc_project/Time.metadata.yaml
@@ -1,14 +1,14 @@
 - name: NotAllowed
   inherits:
-    - xyz.openbmc_project.Common.NotAllowed
+      - xyz.openbmc_project.Common.NotAllowed
   meta:
-    - str: "OWNER=%s"
-      type: string
-    - str: "SYNC_METHOD=%s"
-      type: string
+      - str: "OWNER=%s"
+        type: string
+      - str: "SYNC_METHOD=%s"
+        type: string
 - name: Failed
   inherits:
-    - xyz.openbmc_project.Common.InternalFailure
+      - xyz.openbmc_project.Common.InternalFailure
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
diff --git a/yaml/xyz/openbmc_project/User/Common.metadata.yaml b/yaml/xyz/openbmc_project/User/Common.metadata.yaml
index 2acd27a..1d7a58f 100644
--- a/yaml/xyz/openbmc_project/User/Common.metadata.yaml
+++ b/yaml/xyz/openbmc_project/User/Common.metadata.yaml
@@ -5,15 +5,15 @@
 - name: UserNameGroupFail
   level: ERR
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
 - name: UserNamePrivFail
   level: ERR
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string
 - name: NoResource
   level: ERR
   meta:
-    - str: "REASON=%s"
-      type: string
+      - str: "REASON=%s"
+        type: string