diff --git a/packages/platforms/accton/x86-64/as9736-64d/modules/builds/src/x86-64-accton-as9736-64d-psu.c b/packages/platforms/accton/x86-64/as9736-64d/modules/builds/src/x86-64-accton-as9736-64d-psu.c
index 0019ff5de..2e5a4bfdd 100644
--- a/packages/platforms/accton/x86-64/as9736-64d/modules/builds/src/x86-64-accton-as9736-64d-psu.c
+++ b/packages/platforms/accton/x86-64/as9736-64d/modules/builds/src/x86-64-accton-as9736-64d-psu.c
@@ -98,9 +98,9 @@ static ssize_t show_status(struct device *dev, struct device_attribute *da,
 	}
 
 	if (attr->index == PSU_PRESENT)
-		status = !(data->status >> (1-data->index) & 0x1);
+		status = !(data->status >> (data->index) & 0x1);
 	else /* PSU_POWER_GOOD */
-		status = (data->status >> (3-data->index) & 0x1);
+		status = (data->status >> (2+data->index) & 0x1);
 
 	mutex_unlock(&data->update_lock);
 	return sprintf(buf, "%d\n", status);
diff --git a/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/platform_lib.h b/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/platform_lib.h
index 0cc3b4c3c..66391c06b 100644
--- a/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/platform_lib.h
+++ b/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/platform_lib.h
@@ -45,14 +45,14 @@
 #define PSU_NODE_MAX_INT_LEN  8
 #define PSU_NODE_MAX_PATH_LEN 64
 
-#define PSU1_AC_PMBUS_PREFIX "/sys/bus/i2c/devices/33-0058/"
-#define PSU2_AC_PMBUS_PREFIX "/sys/bus/i2c/devices/41-0059/"
+#define PSU1_AC_PMBUS_PREFIX "/sys/bus/i2c/devices/41-0059/"
+#define PSU2_AC_PMBUS_PREFIX "/sys/bus/i2c/devices/33-0058/"
 
 #define PSU1_AC_PMBUS_NODE(node) PSU1_AC_PMBUS_PREFIX#node
 #define PSU2_AC_PMBUS_NODE(node) PSU2_AC_PMBUS_PREFIX#node
 
-#define PSU1_AC_HWMON_PREFIX "/sys/bus/i2c/devices/33-0050/"
-#define PSU2_AC_HWMON_PREFIX "/sys/bus/i2c/devices/41-0051/"
+#define PSU1_AC_HWMON_PREFIX "/sys/bus/i2c/devices/41-0051/"
+#define PSU2_AC_HWMON_PREFIX "/sys/bus/i2c/devices/33-0050/"
 
 
 #define PSU1_AC_HWMON_NODE(node) PSU1_AC_HWMON_PREFIX#node
diff --git a/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/thermali.c b/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/thermali.c
index f536b9e0d..ae61fda84 100644
--- a/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/thermali.c
+++ b/packages/platforms/accton/x86-64/as9736-64d/onlp/builds/x86_64_accton_as9736_64d/module/src/thermali.c
@@ -79,8 +79,8 @@ static char* devfiles__[] =  /* must map with onlp_thermal_id */
 	"/sys/bus/i2c/devices/58-004c*temp1_input",
 	"/sys/bus/i2c/devices/65-004c*temp1_input",
 	"/sys/bus/i2c/devices/66-004d*temp1_input",
-	"/sys/bus/i2c/devices/33-0058*psu_temp1_input",
 	"/sys/bus/i2c/devices/41-0059*psu_temp1_input",
+	"/sys/bus/i2c/devices/33-0058*psu_temp1_input",
 };
 
 typedef struct {
diff --git a/packages/platforms/accton/x86-64/as9736-64d/platform-config/r0/src/python/x86_64_accton_as9736_64d_r0/__init__.py b/packages/platforms/accton/x86-64/as9736-64d/platform-config/r0/src/python/x86_64_accton_as9736_64d_r0/__init__.py
index 4fb8dce67..92b521d0f 100644
--- a/packages/platforms/accton/x86-64/as9736-64d/platform-config/r0/src/python/x86_64_accton_as9736_64d_r0/__init__.py
+++ b/packages/platforms/accton/x86-64/as9736-64d/platform-config/r0/src/python/x86_64_accton_as9736_64d_r0/__init__.py
@@ -64,12 +64,13 @@ def baseconfig(self):
 
         self.new_i2c_devices([
             # initiate PSU-1
-            ('as9736_64d_psu1', 0x50, 33),
-            ('acbel_fsh082', 0x58, 33),
+            ('as9736_64d_psu1', 0x51, 41),
+            ('acbel_fsh082', 0x59, 41),
 
             # initiate PSU-2
-            ('as9736_64d_psu2', 0x51, 41),
-            ('acbel_fsh082', 0x59, 41),
+
+            ('as9736_64d_psu2', 0x50, 33),
+            ('acbel_fsh082', 0x58, 33),
          ])
 
         self.new_i2c_device('as973d_64d_sys', 0x51, 20)