diff --git a/conf/distro/include/phosphor-defaults.inc b/conf/distro/include/phosphor-defaults.inc
index 5bada92..54b98bc 100644
--- a/conf/distro/include/phosphor-defaults.inc
+++ b/conf/distro/include/phosphor-defaults.inc
@@ -1,27 +1,27 @@
-OBMC_CHASSIS_INSTANCES ?= "0"
-OBMC_POWER_INSTANCES ?= "0"
-OBMC_CHECKSTOP_INSTANCES ?= "0"
-OBMC_HOST_INSTANCES ?= "0"
-OBMC_WATCHDOG_INSTANCES ?= "0"
-OBMC_RESET_BUTTON_INSTANCES ?= "0"
-OBMC_POWER_BUTTON_INSTANCES ?= "0"
 OBMC_BMC_INSTANCES ?= "0"
+OBMC_CHASSIS_INSTANCES ?= "0"
+OBMC_CHECKSTOP_INSTANCES ?= "0"
 OBMC_FAN_INSTANCES ?= ""
+OBMC_HOST_INSTANCES ?= "0"
+OBMC_POWER_BUTTON_INSTANCES ?= "0"
+OBMC_POWER_INSTANCES ?= "0"
+OBMC_RESET_BUTTON_INSTANCES ?= "0"
+OBMC_WATCHDOG_INSTANCES ?= "0"
 
-PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent"
-PREFERRED_PROVIDER_virtual/obmc-event-mgmt ?= "obmc-phosphor-event"
-PREFERRED_PROVIDER_virtual/obmc-user-mgmt ?= "obmc-phosphor-user"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example"
+PREFERRED_PROVIDER_virtual/obmc-bmc-state-mgmt ?= "phosphor-state-manager"
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd"
+PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager"
+PREFERRED_PROVIDER_virtual/obmc-event-mgmt ?= "obmc-phosphor-event"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd"
-PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
-PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
-PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example"
 PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-state-manager"
-PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager"
-PREFERRED_PROVIDER_virtual/obmc-bmc-state-mgmt ?= "phosphor-state-manager"
+PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
+PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
+PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
+PREFERRED_PROVIDER_virtual/obmc-user-mgmt ?= "obmc-phosphor-user"
+PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent"
 
 # virtual/phosphor-ipmi-fru-config
 #