diff --git a/device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json b/device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32/thermal_policy.json b/device/arista/x86_64-arista_7050_qx32/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050_qx32s/thermal_policy.json b/device/arista/x86_64-arista_7050_qx32s/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7050cx3_32s/thermal_policy.json b/device/arista/x86_64-arista_7050cx3_32s/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7050cx3_32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060_cx32s/thermal_policy.json b/device/arista/x86_64-arista_7060_cx32s/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7060_cx32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json b/device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060cx2_32s/thermal_policy.json b/device/arista/x86_64-arista_7060cx2_32s/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7060cx2_32s/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json b/device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7060px4_32/thermal_policy.json b/device/arista/x86_64-arista_7060px4_32/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7060px4_32/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json b/device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7170_32c/thermal_policy.json b/device/arista/x86_64-arista_7170_32c/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7170_32c/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json b/device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7170_32cd/thermal_policy.json b/device/arista/x86_64-arista_7170_32cd/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7170_32cd/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json b/device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7170_64c/thermal_policy.json b/device/arista/x86_64-arista_7170_64c/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7170_64c/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json b/device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7260cx3_64/thermal_policy.json b/device/arista/x86_64-arista_7260cx3_64/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7260cx3_64/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7280cr3_32d4/pmon_daemon_control.json b/device/arista/x86_64-arista_7280cr3_32d4/pmon_daemon_control.json
new file mode 120000
index 0000000000..51d5ab7b00
--- /dev/null
+++ b/device/arista/x86_64-arista_7280cr3_32d4/pmon_daemon_control.json
@@ -0,0 +1 @@
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7280cr3_32d4/thermal_policy.json b/device/arista/x86_64-arista_7280cr3_32d4/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7280cr3_32d4/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json b/device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json
index 2322ef7a22..51d5ab7b00 120000
--- a/device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json
@@ -1 +1 @@
-../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json
\ No newline at end of file
+../x86_64-arista_common/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/thermal_policy.json b/device/arista/x86_64-arista_7280cr3_32p4/thermal_policy.json
new file mode 120000
index 0000000000..0991dc7f36
--- /dev/null
+++ b/device/arista/x86_64-arista_7280cr3_32p4/thermal_policy.json
@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
\ No newline at end of file
diff --git a/device/arista/x86_64-arista_common/pmon_daemon_control.json b/device/arista/x86_64-arista_common/pmon_daemon_control.json
new file mode 100644
index 0000000000..6453cd2c5d
--- /dev/null
+++ b/device/arista/x86_64-arista_common/pmon_daemon_control.json
@@ -0,0 +1,4 @@
+{
+    "skip_fancontrol": true
+}
+
diff --git a/device/arista/x86_64-arista_common/thermal_policy.json b/device/arista/x86_64-arista_common/thermal_policy.json
new file mode 100644
index 0000000000..bc1bd0acfa
--- /dev/null
+++ b/device/arista/x86_64-arista_common/thermal_policy.json
@@ -0,0 +1,60 @@
+{
+    "thermal_control_algorithm": {
+        "run_at_boot_up": "true",
+        "fan_speed_when_suspend": "100"
+    },
+    "info_types": [
+        {
+            "type": "control_info"
+        },
+        {
+            "type": "fan_info"
+        },
+        {
+            "type": "thermal_info"
+        }
+    ],
+    "policies": [
+        {
+            "name": "any thermal critical",
+            "conditions": [
+                {
+                    "type": "thermal.any.critical"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "fan.all.set_speed",
+                    "speed": "100"
+                }
+            ]
+        },
+        {
+            "name": "any thermal overheat",
+            "conditions": [
+                {
+                    "type": "thermal.any.overheat"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "fan.all.set_speed",
+                    "speed": "100"
+                }
+            ]
+        },
+        {
+            "name": "normal operations",
+            "conditions": [
+                {
+                    "type": "normal"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control"
+                }
+            ]
+        }
+    ]
+}
diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 10f08eea27..05a02d74c9 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 10f08eea27329e7090fcedf1857f3ab385a27a27
+Subproject commit 05a02d74c91fb1b91fbb4602bf8c77067da3ecf2
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 10f08eea27..05a02d74c9 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 10f08eea27329e7090fcedf1857f3ab385a27a27
+Subproject commit 05a02d74c91fb1b91fbb4602bf8c77067da3ecf2
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index e864f42a70..b6ea78d53f 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -43,6 +43,7 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += --privileged -t
 $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 # Mount Arista python library on Aboot images to be used by plugins
+$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /run/arista:/run/arista:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/arista:/usr/lib/python3/dist-packages/arista:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro