diff --git a/include/oemcommands.hpp b/include/oemcommands.hpp
index 4e76fda..416cee4 100644
--- a/include/oemcommands.hpp
+++ b/include/oemcommands.hpp
@@ -67,6 +67,7 @@
 static constexpr Cmd cmdSetProcessorErrConfig = 0x9B;
 static constexpr Cmd cmdSetManufacturingData = 0xA1;
 static constexpr Cmd cmdGetManufacturingData = 0xA2;
+static constexpr Cmd cmdSetFITcLayout = 0xA3;
 static constexpr Cmd cmdGetLEDStatus = 0xB0;
 static constexpr Cmd cmdControlBmcServices = 0xB1;
 static constexpr Cmd cmdGetBmcServiceStatus = 0xB2;
diff --git a/ipmi-whitelist.conf b/ipmi-whitelist.conf
index f02d1fc..0ab40c2 100644
--- a/ipmi-whitelist.conf
+++ b/ipmi-whitelist.conf
@@ -264,6 +264,7 @@
 0x30:0x9d:0xff7f   //<Intel General Application>:<Get Fan PWM Limit>
 0x30:0xa1:0x7f7f   //<Intel General Application>:<Capture Manufacturing Data>
 0x30:0xa2:0x7f7f   //<Intel General Application>:<Get Manufacturing Data>
+0x30:0xa3:0x7f7f   //<Intel General Application>:<Set FITc Layout>
 0x30:0xb0:0xff7f   //<Intel General Application>:<Get LED Status>
 0x30:0xb1:0x7f7f   //<Intel General Application>:<Control BMC Services>
 0x30:0xb2:0xff7f   //<Intel General Application>:<Get BMC Service Status>
diff --git a/src/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index c92dd00..7d5a058 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -793,6 +793,8 @@
                         ipmi::intel::general::cmdSetManufacturingData):
         case makeCmdKey(ipmi::netFnOemOne,
                         ipmi::intel::general::cmdGetManufacturingData):
+        case makeCmdKey(ipmi::intel::netFnGeneral,
+                        ipmi::intel::general::cmdSetFITcLayout):
         case makeCmdKey(ipmi::netFnStorage, ipmi::storage::cmdWriteFruData):
         case makeCmdKey(ipmi::netFnOemTwo, ipmi::intel::platform::cmdClearCMOS):
 
@@ -979,6 +981,34 @@
     ipmi::Cc retI2C = ipmi::i2cWriteRead(i2cBus, slaveAddr, writeData, readBuf);
     return ipmi::response(retI2C);
 }
+
+ipmi::RspType<> setFITcLayout(uint32_t layout)
+{
+    static constexpr const char* factoryFITcLayout =
+        "/var/sofs/factory-settings/layout/fitc";
+    std::filesystem::path fitcDir =
+        std::filesystem::path(factoryFITcLayout).parent_path();
+    std::error_code ec;
+    std::filesystem::create_directories(fitcDir, ec);
+    if (ec)
+    {
+        return ipmi::responseUnspecifiedError();
+    }
+    try
+    {
+        std::ofstream file(factoryFITcLayout);
+        file << layout;
+        file.flush();
+        file.close();
+    }
+    catch (const std::exception& e)
+    {
+        return ipmi::responseUnspecifiedError();
+    }
+
+    return ipmi::responseSuccess();
+}
+
 } // namespace ipmi
 
 void register_mtm_commands() __attribute__((constructor));
@@ -1005,6 +1035,10 @@
                           ipmi::intel::general::cmdGetManufacturingData,
                           ipmi::Privilege::Admin, ipmi::getManufacturingData);
 
+    ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnGeneral,
+                          ipmi::intel::general::cmdSetFITcLayout,
+                          ipmi::Privilege::Admin, ipmi::setFITcLayout);
+
     ipmi::registerHandler(ipmi::prioOemBase, ipmi::intel::netFnApp,
                           ipmi::intel::general::cmdSlotI2CMasterWriteRead,
                           ipmi::Privilege::Admin,