diff --git a/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh b/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh
index 520b1c9..56ae7bb 100644
--- a/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh
+++ b/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh
@@ -33,9 +33,9 @@
 
 fan_tach_path=( '/xyz/openbmc_project/sensors/fan_tach/fan0'
                 '/xyz/openbmc_project/sensors/fan_tach/fan1'
-                '/xyz/openbmc_project/sensors/fan_tach/fan2'
-                '/xyz/openbmc_project/sensors/fan_tach/fan3'
-                '/xyz/openbmc_project/sensors/fan_tach/fan4'
+                '/xyz/openbmc_project/sensors/fan_tach/fb_fan0'
+                '/xyz/openbmc_project/sensors/fan_tach/fb_fan1'
+                '/xyz/openbmc_project/sensors/fan_tach/fb_fan2'
                 )
 
 check_fail_flag=0
diff --git a/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json b/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json
index a0992b7..f4e453a 100644
--- a/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json
+++ b/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json
@@ -18,9 +18,9 @@
     "fan": [
         {"instance": 0, "name": "/fan0"},
         {"instance": 1, "name": "/fan1"},
-        {"instance": 2, "name": "/fan2"},
-        {"instance": 3, "name": "/fan3"},
-        {"instance": 4, "name": "/fan4"}
+        {"instance": 2, "name": "/fb_fan0"},
+        {"instance": 3, "name": "/fb_fan1"},
+        {"instance": 4, "name": "/fb_fan2"}
     ],
     "cooling_unit": [
         {"instance": 0, "name": "/ZONE0"},