diff --git a/lib/openbmc_ffdc_list.py b/lib/openbmc_ffdc_list.py
index eb4811d..459ef4f 100755
--- a/lib/openbmc_ffdc_list.py
+++ b/lib/openbmc_ffdc_list.py
@@ -200,6 +200,7 @@
     'BMC LOGS':
     {
         # Description               Keyword name
+        'Start ffdc cleanup': 'BMC FFDC Cleanup',
         'FFDC Generic Report': 'BMC FFDC Manifest',
         'BMC Specific Files': 'BMC FFDC Files',
         'Get Request FFDC': 'BMC FFDC Get Requests',
@@ -217,6 +218,7 @@
         + ' enum_uri=/redfish/v1/UpdateService/FirmwareInventory  '
         + ' file_enum_name=redfish_FIRMWARE_list.txt',
         'Redfish OEM Log': 'Enumerate Redfish OEM Resources',
+        'End ffdc cleanup': 'BMC FFDC Cleanup',
     },
 }
 
diff --git a/lib/openbmc_ffdc_methods.robot b/lib/openbmc_ffdc_methods.robot
index ad0bbc0..475e412 100755
--- a/lib/openbmc_ffdc_methods.robot
+++ b/lib/openbmc_ffdc_methods.robot
@@ -21,6 +21,8 @@
 *** Variables ***
 
 ${FFDC_CMD_TIMEOUT}    240
+${FFDC_BMC_FILES_CLEANUP}  rm -rf /tmp/BMC_* /tmp/PEL_* /tmp/PLDM_*
+...                        /tmp/OCC_* /tmp/fan_* /tmp/GUARD_* /tmp/DEVTREE
 
 *** Keywords ***
 
@@ -124,6 +126,14 @@
     ${status}  ${ffdc_file_list}=  Run Key  ${keyword_name}  ignore=1
     [Return]  ${ffdc_file_list}
 
+
+BMC FFDC Cleanup
+    [Documentation]  Run the ssh commands from FFDC_BMC_FILES_CLEANUP.
+
+    Log To Console  BMC FFDC Files clean up: ${FFDC_BMC_FILES_CLEANUP}
+    BMC Execute Command   ${FFDC_BMC_FILES_CLEANUP}  ignore_err=1
+
+
 # Method : BMC FFDC Manifest                                   #
 #          Execute command on BMC and write to ffdc_report.txt #