diff --git a/vpd_tool.cpp b/vpd_tool.cpp
index 740d5cd..a0699bb 100644
--- a/vpd_tool.cpp
+++ b/vpd_tool.cpp
@@ -80,6 +80,10 @@
         "User should provide valid hardware/eeprom path (and not dbus object "
         "path) in the -O/--object path. CAUTION: Developer Only Option");
 
+    auto fixSystemVPDFlag = app.add_flag(
+        "--fixSystemVPD", "Use this option to interactively fix critical "
+                          "system VPD keywords {vpd-tool-exe --fixSystemVPD}");
+
     CLI11_PARSE(app, argc, argv);
 
     ifstream inventoryJson(INVENTORY_JSON_SYM_LINK);
@@ -155,6 +159,11 @@
                                move(keyword));
             vpdToolObj.readKwFromHw(offset);
         }
+        else if (*fixSystemVPDFlag)
+        {
+            VpdTool vpdToolObj;
+            rc = vpdToolObj.fixSystemVPD();
+        }
         else
         {
             throw runtime_error("One of the valid options is required. Refer "