diff --git a/katran/lib/KatranLb.cpp b/katran/lib/KatranLb.cpp
index 82cfd835c..9db3cc3bc 100644
--- a/katran/lib/KatranLb.cpp
+++ b/katran/lib/KatranLb.cpp
@@ -825,7 +825,7 @@ void KatranLb::loadBpfProgs() {
 
 bool KatranLb::reloadBalancerProg(
     const std::string& path,
-    folly::Optional<KatranConfig> config) {
+    std::optional<KatranConfig> config) {
   int res;
   res = bpfAdapter_->reloadBpfProg(path);
   if (res) {
@@ -1509,7 +1509,7 @@ std::unique_ptr<folly::IOBuf> KatranLb::getKatranMonitorEventBuffer(
 
 bool KatranLb::restartKatranMonitor(
     uint32_t limit,
-    folly::Optional<PcapStorageFormat> storage) {
+    std::optional<PcapStorageFormat> storage) {
   if (!monitor_) {
     return false;
   }
diff --git a/katran/lib/KatranLb.h b/katran/lib/KatranLb.h
index c19f0130e..3903ee693 100644
--- a/katran/lib/KatranLb.h
+++ b/katran/lib/KatranLb.h
@@ -151,7 +151,7 @@ class KatranLb {
    */
   bool reloadBalancerProg(
       const std::string& path,
-      folly::Optional<KatranConfig> config = folly::none);
+      std::optional<KatranConfig> config = std::nullopt);
 
   /**
    * helper function to attach bpf program (e.g. to rootlet array,
@@ -677,7 +677,7 @@ class KatranLb {
    */
   bool restartKatranMonitor(
       uint32_t limit,
-      folly::Optional<PcapStorageFormat> storage = folly::none);
+      std::optional<PcapStorageFormat> storage = std::nullopt);
 
   /**
    * @param monitoring::EventId event monitoring event id. see
@@ -1097,7 +1097,7 @@ class KatranLb {
 
   std::unordered_map<VipKey, Vip, VipKeyHasher> vips_;
 
-  folly::Optional<VipKey> lruMissStatsVip_;
+  std::optional<VipKey> lruMissStatsVip_;
 
   /**
    * Maps an HcKey to its id
diff --git a/katran/lib/KatranMonitor.cpp b/katran/lib/KatranMonitor.cpp
index 7674188df..3b85c3651 100644
--- a/katran/lib/KatranMonitor.cpp
+++ b/katran/lib/KatranMonitor.cpp
@@ -74,7 +74,7 @@ void KatranMonitor::stopMonitor() {
 
 void KatranMonitor::restartMonitor(
     uint32_t limit,
-    folly::Optional<PcapStorageFormat> storage) {
+    std::optional<PcapStorageFormat> storage) {
   if (storage.has_value() && config_.storage != *storage) {
     stopMonitor();
     config_.storage = *storage;
diff --git a/katran/lib/KatranMonitor.h b/katran/lib/KatranMonitor.h
index 78c7d2780..894ae0fb8 100644
--- a/katran/lib/KatranMonitor.h
+++ b/katran/lib/KatranMonitor.h
@@ -48,9 +48,7 @@ class KatranMonitor {
 
   void stopMonitor();
 
-  void restartMonitor(
-      uint32_t limit,
-      folly::Optional<PcapStorageFormat> storage);
+  void restartMonitor(uint32_t limit, std::optional<PcapStorageFormat> storage);
 
   PcapWriterStats getWriterStats();
 
diff --git a/katran/lib/MonitoringServiceCore.h b/katran/lib/MonitoringServiceCore.h
index 339d88e11..97b56b45a 100644
--- a/katran/lib/MonitoringServiceCore.h
+++ b/katran/lib/MonitoringServiceCore.h
@@ -78,9 +78,9 @@ class MonitoringServiceCore
    */
   typedef struct SubscriptionResult {
     ResponseStatus status;
-    folly::Optional<ClientId> cid;
-    folly::Optional<EventIds> subscribed_events;
-    folly::Optional<std::shared_ptr<SubscriptionCallback>> sub_cb;
+    std::optional<ClientId> cid;
+    std::optional<EventIds> subscribed_events;
+    std::optional<std::shared_ptr<SubscriptionCallback>> sub_cb;
 
     /**
      * Constructor used for error and empty results
diff --git a/katran/lib/testing/BpfTester.h b/katran/lib/testing/BpfTester.h
index 1cadc4fba..f424ea9f0 100644
--- a/katran/lib/testing/BpfTester.h
+++ b/katran/lib/testing/BpfTester.h
@@ -52,7 +52,7 @@ struct TesterConfig {
    */
   int bpfProgFd{-1};
 
-  folly::Optional<int> singleTestRunPacketNumber_{folly::none};
+  std::optional<int> singleTestRunPacketNumber_{std::nullopt};
 };
 
 /**
diff --git a/katran/lib/testing/PacketAttributes.h b/katran/lib/testing/PacketAttributes.h
index abac5842f..9466e3ec2 100644
--- a/katran/lib/testing/PacketAttributes.h
+++ b/katran/lib/testing/PacketAttributes.h
@@ -37,7 +37,7 @@ struct PacketAttributes {
 
   // We set this if we want to verify whether or not the packet was
   // routed through global lru
-  folly::Optional<bool> routedThroughGlobalLru{folly::none};
+  std::optional<bool> routedThroughGlobalLru{std::nullopt};
 };
 
 } // namespace katran