diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index a47ddb7..a8742f7 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -81,8 +81,26 @@ if(WIN32)
   )
 endif()
 
+# Configure libassert
+include(FetchContent)
+FetchContent_Declare(
+  libassert
+  GIT_REPOSITORY https://github.com/jeremy-rifkin/libassert.git
+  GIT_TAG        v2.1.5
+)
+FetchContent_MakeAvailable(libassert)
+include(FetchContent)
+FetchContent_Declare(
+  cpptrace
+  GIT_REPOSITORY https://github.com/jeremy-rifkin/cpptrace.git
+  GIT_TAG        v0.8.3
+)
+FetchContent_MakeAvailable(cpptrace)
+
 # Link libraries
 target_link_libraries(dropshell PRIVATE
+    libassert::assert
+    cpptrace::cpptrace
 )
 
 # Install targets
diff --git a/source/src/autocomplete.cpp b/source/src/autocomplete.cpp
index 53a08d6..398da85 100644
--- a/source/src/autocomplete.cpp
+++ b/source/src/autocomplete.cpp
@@ -5,7 +5,7 @@
 #include "services.hpp"
 #include "servers.hpp"
 
-#include <assert.hpp>
+#include <libassert/assert.hpp>
 #include <algorithm>
 #include <iostream>
 
diff --git a/source/src/commands/backupdata.cpp b/source/src/commands/backupdata.cpp
index 6b62cd6..9b0837c 100644
--- a/source/src/commands/backupdata.cpp
+++ b/source/src/commands/backupdata.cpp
@@ -5,7 +5,7 @@
 #include <filesystem>
 
 #include "utils/output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "command_registry.hpp"
 #include "config.hpp"
diff --git a/source/src/commands/colours.cpp b/source/src/commands/colours.cpp
index 4339c21..7eeabb2 100644
--- a/source/src/commands/colours.cpp
+++ b/source/src/commands/colours.cpp
@@ -1,7 +1,7 @@
 #include "command_registry.hpp"
 #include "config.hpp"
 #include "utils/output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 
diff --git a/source/src/commands/create-server.cpp b/source/src/commands/create-server.cpp
index ef9a585..2c8017f 100644
--- a/source/src/commands/create-server.cpp
+++ b/source/src/commands/create-server.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 
diff --git a/source/src/commands/create-service.cpp b/source/src/commands/create-service.cpp
index 5877cba..f38a2a2 100644
--- a/source/src/commands/create-service.cpp
+++ b/source/src/commands/create-service.cpp
@@ -3,7 +3,7 @@
 #include "shared_commands.hpp"
 #include "templates.hpp"
 
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "services.hpp"
 
diff --git a/source/src/commands/create-template.cpp b/source/src/commands/create-template.cpp
index 2c182b4..502f28f 100644
--- a/source/src/commands/create-template.cpp
+++ b/source/src/commands/create-template.cpp
@@ -4,7 +4,7 @@
 #include "utils/directories.hpp"
 #include "shared_commands.hpp"
 #include "version.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "templates.hpp"
 
 #include <unistd.h>
diff --git a/source/src/commands/destroy.cpp b/source/src/commands/destroy.cpp
index eb86b0e..b94d0cc 100644
--- a/source/src/commands/destroy.cpp
+++ b/source/src/commands/destroy.cpp
@@ -8,7 +8,7 @@
 #include "templates.hpp"
 #include "utils/utils.hpp"
 
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell
 {
diff --git a/source/src/commands/edit.cpp b/source/src/commands/edit.cpp
index e20d236..38a900a 100644
--- a/source/src/commands/edit.cpp
+++ b/source/src/commands/edit.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 
diff --git a/source/src/commands/help.cpp b/source/src/commands/help.cpp
index 356fd3e..d32414d 100644
--- a/source/src/commands/help.cpp
+++ b/source/src/commands/help.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 
diff --git a/source/src/commands/install.cpp b/source/src/commands/install.cpp
index e847875..fcdeba0 100644
--- a/source/src/commands/install.cpp
+++ b/source/src/commands/install.cpp
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "servers.hpp"
 
 namespace dropshell
diff --git a/source/src/commands/list.cpp b/source/src/commands/list.cpp
index 05b610f..0ecbc11 100644
--- a/source/src/commands/list.cpp
+++ b/source/src/commands/list.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 
diff --git a/source/src/commands/restoredata.cpp b/source/src/commands/restoredata.cpp
index b0b60f4..caf69ad 100644
--- a/source/src/commands/restoredata.cpp
+++ b/source/src/commands/restoredata.cpp
@@ -5,7 +5,7 @@
 #include <filesystem>
 
 #include "utils/output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "command_registry.hpp"
 #include "config.hpp"
diff --git a/source/src/commands/shared_commands.cpp b/source/src/commands/shared_commands.cpp
index c3df40c..8c1bd25 100644
--- a/source/src/commands/shared_commands.cpp
+++ b/source/src/commands/shared_commands.cpp
@@ -1,5 +1,5 @@
 #include "shared_commands.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "servers.hpp"
 #include "directories.hpp"
diff --git a/source/src/commands/ssh.cpp b/source/src/commands/ssh.cpp
index 97701a0..f2361b6 100644
--- a/source/src/commands/ssh.cpp
+++ b/source/src/commands/ssh.cpp
@@ -7,7 +7,7 @@
 #include "services.hpp"
 #include "servers.hpp"
 #include "templates.hpp"
-#include "assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell
 {
diff --git a/source/src/commands/uninstall.cpp b/source/src/commands/uninstall.cpp
index 493b881..be46787 100644
--- a/source/src/commands/uninstall.cpp
+++ b/source/src/commands/uninstall.cpp
@@ -3,7 +3,7 @@
 #include "shared_commands.hpp"
 #include "templates.hpp"
 
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "services.hpp"
 
diff --git a/source/src/main.cpp b/source/src/main.cpp
index af518f2..0d987fb 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -16,7 +16,7 @@
 #include <vector>
 #include <iomanip>
 #include <chrono>
-#include <assert.hpp>
+#include <libassert/assert.hpp>
 #include <sstream>
 #include <algorithm>
 namespace dropshell {
diff --git a/source/src/servers.cpp b/source/src/servers.cpp
index 53907cd..29a24a0 100644
--- a/source/src/servers.cpp
+++ b/source/src/servers.cpp
@@ -6,7 +6,7 @@
 #include "utils/utils.hpp"
 #include "utils/execute.hpp"
 #include "output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "config.hpp"
 
 #include <iostream>
diff --git a/source/src/service_runner.cpp b/source/src/service_runner.cpp
index 0509f58..393e433 100644
--- a/source/src/service_runner.cpp
+++ b/source/src/service_runner.cpp
@@ -7,7 +7,7 @@
 // #include <iomanip>
 // #include <filesystem>
 // #include <unistd.h>
-// #include "utils/assert.hpp"
+// #include <libassert/assert.hpp>
 
 // #include "config.hpp"
 // #include "servers.hpp"
diff --git a/source/src/services.cpp b/source/src/services.cpp
index 23f5ebf..5800e7d 100644
--- a/source/src/services.cpp
+++ b/source/src/services.cpp
@@ -4,7 +4,7 @@
 #include "templates.hpp"
 #include "config.hpp"
 #include "utils/utils.hpp"
-#include "assert.hpp"
+#include <libassert/assert.hpp>
 
 #include <iostream>
 #include <filesystem>
diff --git a/source/src/templates.cpp b/source/src/templates.cpp
index c790119..f453734 100644
--- a/source/src/templates.cpp
+++ b/source/src/templates.cpp
@@ -6,7 +6,7 @@
     #include <algorithm>
     #include <iomanip>
     #include <map>
-    #include "utils/assert.hpp"
+    #include <libassert/assert.hpp>
 
     #include "utils/envmanager.hpp"
     #include "utils/directories.hpp"
diff --git a/source/src/utils/assert.hpp b/source/src/utils/assert.hpp
deleted file mode 100644
index 4a08ed5..0000000
--- a/source/src/utils/assert.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ASSERT_HPP
-#define ASSERT_HPP
-
-#include "output.hpp"
-
-#define ASSERT(condition, message) \
-    if (!(condition)) { \
-        dropshell::error << "Assertion failed: " << message << std::endl; \
-        std::exit(1); \
-    }
-
-
-#endif // ASSERT_HPP
diff --git a/source/src/utils/execute.cpp b/source/src/utils/execute.cpp
index 6a5e0b4..39b854f 100644
--- a/source/src/utils/execute.cpp
+++ b/source/src/utils/execute.cpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <cstdlib>
 #include <sstream>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 #include "execute.hpp"
 #include "utils/utils.hpp"