diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 67a0641..46caf90 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -429,6 +429,7 @@
                       var title = "";
                       var tempKeyParts = [];
                       var order = 0;
+                      var customOrder = 0;
 
                       function getScaledValue(value, scale){
                         scale = scale + "";
@@ -503,6 +504,12 @@
 
                           content.data[key].Value = getScaledValue(content.data[key].Value, content.data[key].Scale);
 
+                          if(Constants.SENSOR_SORT_ORDER.indexOf(content.data[key].Unit) > -1){
+                            customOrder = Constants.SENSOR_SORT_ORDER.indexOf(content.data[key].Unit);
+                          }else{
+                            customOrder = Constants.SENSOR_SORT_ORDER_DEFAULT;
+                          }
+
                           sensorData.push(Object.assign({
                             path: key,
                             selected: false,
@@ -513,6 +520,7 @@
                             severity_flags: severity.flags,
                             status: severity.severityText,
                             order: severity.order,
+                            custom_order: customOrder,
                             search_text: (title + " " + content.data[key].Value + " " + 
                                Constants.SENSOR_UNIT_MAP[content.data[key].Unit] + " " + 
                                severity.severityText + " " + 
diff --git a/app/common/services/constants.js b/app/common/services/constants.js
index 6418c32..7c4b340 100644
--- a/app/common/services/constants.js
+++ b/app/common/services/constants.js
@@ -20,7 +20,7 @@
                     password: "testpass",
                 },
                 API_CREDENTIALS: {
-                    host: 'https://9.3.185.161',
+                    host: 'https://9.3.181.64',
                     mock_host: 'http://localhost:3000'
                 },
                 API_RESPONSE: {
@@ -36,7 +36,7 @@
                 HOST_STATE_TEXT: {
                     on: 'Running',
                     off: 'Off',
-                    booting: 'Standby',
+                    booting: 'Quiesced',
                     unreachable: 'Unreachable'
                 },
                 HOST_STATE: {
@@ -99,7 +99,17 @@
                     warning: 'Warning',
                     good: 'Good',
                     unknown: 'Unknown'
-                }
+                },
+                SENSOR_SORT_ORDER: [
+                   'xyz.openbmc_project.Sensor.Value.Unit.DegreesC',
+                   'xyz.openbmc_project.Sensor.Value.Unit.RPMS',
+                   'xyz.openbmc_project.Sensor.Value.Unit.Meters',
+                   'xyz.openbmc_project.Sensor.Value.Unit.Volts',
+                   'xyz.openbmc_project.Sensor.Value.Unit.Amperes',
+                   'xyz.openbmc_project.Sensor.Value.Unit.Joules',
+                   'xyz.openbmc_project.Sensor.Value.Unit.Meters'
+                ],
+                SENSOR_SORT_ORDER_DEFAULT: 8
             };
         });
 
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index e0accde..f00deff 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -48,7 +48,7 @@
 			</div>
 		</div>
 		<!-- sensor -->
-		<div class="sensor__readings-row" ng-repeat="sensor in (filteredSensorData = data|filter:filterBySeverity|filter:filterBySearchTerms|orderBy:'-order')">
+		<div class="sensor__readings-row" ng-repeat="sensor in (filteredSensorData = data|filter:filterBySeverity|filter:filterBySearchTerms|orderBy:'+custom_order')">
 			<p class="inline sensor__title"><span class="icon" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="sensor.status" ></span>{{sensor.title}}</p>
 			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>{{sensor.CriticalLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
 			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>{{sensor.WarningLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>