diff --git a/.gitmodules b/.gitmodules
index bb4eae528c..57cd558057 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -78,5 +78,5 @@
 	path = platform/broadcom/sonic-platform-modules-mitac
 	url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
 [submodule "platform/p4/sonic-platform-modules-arista"]
-	path = platform/p4/sonic-platform-modules-arista
+	path = platform/barefoot/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
diff --git a/platform/barefoot/one-aboot.mk b/platform/barefoot/one-aboot.mk
new file mode 100644
index 0000000000..4c4a6b6f62
--- /dev/null
+++ b/platform/barefoot/one-aboot.mk
@@ -0,0 +1,13 @@
+# sonic one aboot installer
+
+SONIC_ONE_ABOOT_IMAGE = sonic-aboot-barefoot.swi
+$(SONIC_ONE_ABOOT_IMAGE)_MACHINE = barefoot
+$(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
+$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE)
+$(SONIC_ONE_ABOOT_IMAGE)_LAZY_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
+$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) \
+                                     $(ARISTA_PLATFORM_MODULE_PYTHON2) \
+                                     $(ARISTA_PLATFORM_MODULE_PYTHON3) \
+                                     $(ARISTA_PLATFORM_MODULE)
+$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
+SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)
diff --git a/platform/p4/platform-modules-arista.mk b/platform/barefoot/platform-modules-arista.mk
similarity index 100%
rename from platform/p4/platform-modules-arista.mk
rename to platform/barefoot/platform-modules-arista.mk
diff --git a/platform/barefoot/rules.mk b/platform/barefoot/rules.mk
index f10952dfad..2ee49adb8a 100644
--- a/platform/barefoot/rules.mk
+++ b/platform/barefoot/rules.mk
@@ -1,3 +1,4 @@
+include $(PLATFORM_PATH)/platform-modules-arista.mk
 include $(PLATFORM_PATH)/platform-modules-bfn.mk
 include $(PLATFORM_PATH)/platform-modules-bfn-montara.mk
 include $(PLATFORM_PATH)/platform-modules-wnc-osw1800.mk
@@ -6,6 +7,7 @@ include $(PLATFORM_PATH)/bfn-sai.mk
 include $(PLATFORM_PATH)/docker-syncd-bfn.mk
 include $(PLATFORM_PATH)/docker-syncd-bfn-rpc.mk
 include $(PLATFORM_PATH)/docker-orchagent-bfn.mk
+include $(PLATFORM_PATH)/one-aboot.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/python-saithrift.mk
@@ -13,7 +15,8 @@ include $(PLATFORM_PATH)/docker-ptf-bfn.mk
 include $(PLATFORM_PATH)/bfn-platform.mk
 include $(PLATFORM_PATH)/bfn-platform-wnc.mk
 include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk
-SONIC_ALL += $(SONIC_ONE_IMAGE) \
+
+SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
              $(DOCKER_FPM)
 
 # Inject sai into sairedis
diff --git a/platform/p4/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
similarity index 100%
rename from platform/p4/sonic-platform-modules-arista
rename to platform/barefoot/sonic-platform-modules-arista
diff --git a/platform/p4/one-aboot.mk b/platform/p4/one-aboot.mk
deleted file mode 100644
index 95babf045c..0000000000
--- a/platform/p4/one-aboot.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# sonic broadcom one image installer
-
-SONIC_ONE_ABOOT_IMAGE = sonic-aboot-p4.swi
-$(SONIC_ONE_ABOOT_IMAGE)_MACHINE = p4
-$(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
-$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON2) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
-
-# FIXME: this is a temporary workaround for testing the platform driver
-$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += docker-platform-monitor.gz
-# $(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
-
-SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)
diff --git a/platform/p4/rules.mk b/platform/p4/rules.mk
index ea3e31e973..7fe6a60fad 100644
--- a/platform/p4/rules.mk
+++ b/platform/p4/rules.mk
@@ -1,6 +1,4 @@
 # include $(PLATFORM_PATH)/p4-softswitch.mk
-include $(PLATFORM_PATH)/platform-modules-arista.mk
-include $(PLATFORM_PATH)/one-aboot.mk
 include $(PLATFORM_PATH)/tenjin.mk
 include $(PLATFORM_PATH)/p4-hlir.mk
 include $(PLATFORM_PATH)/p4c-bm.mk