diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b98ea9..babffea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,9 +48,6 @@ target_include_directories(dropshell PRIVATE
 
 # Link libraries
 target_link_libraries(dropshell PRIVATE
-    Boost::program_options
-    Boost::filesystem
-    Boost::system
     ${CURSES_LIBRARIES}
     TBB::tbb
 )
diff --git a/src/main.cpp b/src/main.cpp
index d18f618..512da45 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,7 +9,6 @@
 #include "utils/readmes.hpp"
 #include "autocomplete.hpp"
 #include "main_commands.hpp"
-#include <boost/filesystem.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/src/server_env.cpp b/src/server_env.cpp
index 15025e7..40ca9a2 100644
--- a/src/server_env.cpp
+++ b/src/server_env.cpp
@@ -1,10 +1,9 @@
 #include "server_env.hpp"
 #include "utils/envmanager.hpp"
 #include "utils/directories.hpp"
-#include <boost/filesystem.hpp>
 #include <iostream>
 #include <memory>
-
+#include <filesystem>
 namespace dropshell {
 
 bool server_env::is_valid() const {
@@ -22,7 +21,7 @@ server_env::server_env(const std::string& server_name) : mValid(false) {
     std::string env_path = get_local_server_env_path(server_name);
     
     // Check if file exists
-    if (!boost::filesystem::exists(env_path)) {
+    if (!std::filesystem::exists(env_path)) {
         throw std::runtime_error("Server environment file not found: " + env_path);
     }
 
diff --git a/src/servers.cpp b/src/servers.cpp
index 6347693..ff70659 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -10,11 +10,8 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
 #include <execution>
 #include <filesystem>
-namespace fs = boost::filesystem;
 
 namespace dropshell {
 
@@ -27,10 +24,10 @@ std::vector<ServerInfo> get_configured_servers() {
 
     for (int i = 0; i < local_config_directories.size(); i++) {
         std::string servers_dir = get_local_config_servers_path(i);
-        if (!servers_dir.empty() && fs::exists(servers_dir)) {
+        if (!servers_dir.empty() && std::filesystem::exists(servers_dir)) {
 
-            for (const auto& entry : fs::directory_iterator(servers_dir)) {
-                if (fs::is_directory(entry)) {
+            for (const auto& entry : std::filesystem::directory_iterator(servers_dir)) {
+                if (std::filesystem::is_directory(entry)) {
                     std::string server_name = entry.path().filename().string();
 
                     server_env env(server_name);
@@ -159,7 +156,7 @@ void create_server(const std::string &server_name)
     // 2. create a new directory in the user config directory
     std::string config_servers_dir = get_local_config_servers_path(0);
     std::string server_dir = config_servers_dir + "/" + server_name;
-    fs::create_directory(server_dir);
+    std::filesystem::create_directory(server_dir);
 
     // 3. create a template server.env file in the server directory
     std::string user = getenv("USER");
@@ -174,7 +171,7 @@ void create_server(const std::string &server_name)
 
     // 4. add dropshell-agent service to server
     std::string service_dir = server_dir + "/dropshell-agent";
-    fs::create_directory(service_dir);
+    std::filesystem::create_directory(service_dir);
     std::string service_env_path = service_dir + "/service.env";
     std::filesystem::copy(get_local_system_templates_path() + "/dropshell-agent/example/service.env", service_env_path);
 
diff --git a/src/service_runner.cpp b/src/service_runner.cpp
index 0a6ebc8..191b5b1 100644
--- a/src/service_runner.cpp
+++ b/src/service_runner.cpp
@@ -5,15 +5,16 @@
 #include "services.hpp"
 #include "utils/directories.hpp"
 #include "utils/utils.hpp"
-#include <boost/filesystem.hpp>
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <cstdlib>
 #include <chrono>
 #include <iomanip>
+#include <filesystem>
+#include <unistd.h>
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 
 namespace dropshell {
 
diff --git a/src/services.cpp b/src/services.cpp
index 79fed98..3be6085 100644
--- a/src/services.cpp
+++ b/src/services.cpp
@@ -5,10 +5,10 @@
 #include "config.hpp"
 #include "utils/utils.hpp"
 #include "server_env.hpp"
-#include <boost/filesystem.hpp>
 #include <iostream>
+#include <filesystem>
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 
 namespace dropshell {