diff --git a/platform/barefoot/one-aboot.mk b/platform/barefoot/one-aboot.mk
index 4e5e808d2a..a2cdf2ac03 100644
--- a/platform/barefoot/one-aboot.mk
+++ b/platform/barefoot/one-aboot.mk
@@ -11,5 +11,10 @@ $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) \
                                      $(ARISTA_PLATFORM_MODULE_PYTHON2) \
                                      $(ARISTA_PLATFORM_MODULE_PYTHON3) \
                                      $(ARISTA_PLATFORM_MODULE)
+ifeq ($(INSTALL_DEBUG_TOOLS),y)
+$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
+$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))
+else
 $(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
+endif
 SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)
diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index ab4e8e17e6..c52f43edbe 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit ab4e8e17e610e23d66b024fbf27bd83b41edf44c
+Subproject commit c52f43edbe2ec842d5a807c71a4aba453ce60490
diff --git a/platform/broadcom/one-aboot.mk b/platform/broadcom/one-aboot.mk
index f68319ab64..959cda2090 100644
--- a/platform/broadcom/one-aboot.mk
+++ b/platform/broadcom/one-aboot.mk
@@ -6,5 +6,10 @@ $(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BRCM_OPENNSL_KERNEL) $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON2) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(PHY_CREDO)
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
+ifeq ($(INSTALL_DEBUG_TOOLS),y)
+$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
+$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))
+else
 $(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
+endif
 SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index ab4e8e17e6..c52f43edbe 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit ab4e8e17e610e23d66b024fbf27bd83b41edf44c
+Subproject commit c52f43edbe2ec842d5a807c71a4aba453ce60490