diff --git a/include/ChassisIntrusionSensor.hpp b/include/ChassisIntrusionSensor.hpp
index 651e768..f65ef33 100644
--- a/include/ChassisIntrusionSensor.hpp
+++ b/include/ChassisIntrusionSensor.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <gpiod.hpp>
 #include <memory>
 #include <sdbusplus/asio/object_server.hpp>
 #include <string>
@@ -20,7 +21,7 @@
     ~ChassisIntrusionSensor();
 
     void start(IntrusionSensorType type, int busId, int slaveAddr,
-               int gpioIndex, bool gpioInverted);
+               bool gpioInverted);
 
   private:
     std::shared_ptr<sdbusplus::asio::dbus_interface> mIface;
@@ -38,10 +39,10 @@
     boost::asio::deadline_timer mPollTimer;
 
     // valid if it is via GPIO
-    int mGpioIndex;
     bool mGpioInverted;
-    boost::asio::ip::tcp::socket mInputDev;
-    int mFd;
+    std::string mPinName = "CHASSIS_INTRUSION";
+    gpiod::line mGpioLine;
+    boost::asio::posix::stream_descriptor mGpioFd;
 
     // common members
     bool mOverridenState = false;
@@ -54,6 +55,6 @@
     void pollSensorStatusByPch();
     void readGpio();
     void pollSensorStatusByGpio();
-    void initGpioDeviceFile(const int index);
+    void initGpioDeviceFile();
     int setSensorValue(const std::string& req, std::string& propertyValue);
 };
diff --git a/include/Utils.hpp b/include/Utils.hpp
index d97ff9c..565656a 100644
--- a/include/Utils.hpp
+++ b/include/Utils.hpp
@@ -17,7 +17,6 @@
 #include <variant>
 #include <vector>
 
-constexpr const char* gpioPath = "/sys/class/gpio/";
 const constexpr char* jsonStore = "/var/configuration/flattened.json";
 const constexpr char* inventoryPath = "/xyz/openbmc_project/inventory";
 const constexpr char* entityManagerName = "xyz.openbmc_project.EntityManager";