diff --git a/lua/custom/plugins/lsp.lua b/lua/custom/plugins/lsp.lua
index 084ccb5..488c184 100644
--- a/lua/custom/plugins/lsp.lua
+++ b/lua/custom/plugins/lsp.lua
@@ -359,9 +359,36 @@ return {
   {
     'mfussenegger/nvim-dap',
     lazy = false,
-    init = function()
-      require('core.utils').load_mappings 'debug'
-    end,
+    keys = {
+      {
+        '<leader>db',
+        function()
+          require('dap').toggle_breakpoint()
+        end,
+        desc = 'Set [D]ebug [B]reakpoint',
+      },
+      {
+        '<leader>dc',
+        function()
+          require('dap').continue()
+        end,
+        desc = '[D]ebug [C]ontinue',
+      },
+      {
+        '<leader>ds',
+        function()
+          require('dap').step_over()
+        end,
+        desc = 'Set [D]ebug [S]tep over',
+      },
+      {
+        '<leader>di',
+        function()
+          require('dap').step_into()
+        end,
+        desc = 'Set [D]ebug step [I]nto',
+      },
+    },
     config = function()
       local dap = require 'dap'
       local mason_registry = require 'mason-registry'
@@ -408,9 +435,79 @@ return {
   },
   {
     'rcarriga/nvim-dap-ui',
-    init = function()
-      require('core.utils').load_mappings 'debug'
-    end,
+    keys = {
+      {
+        '<leader>du',
+        function()
+          require('dapui').toggle()
+        end,
+
+        desc = 'Open [D]ebug [U]i',
+      },
+      {
+        '<leader>dK',
+        function()
+          require('dap.ui.widgets').hover()
+        end,
+
+        desc = 'Open [D]ebug [K] hover',
+      },
+      {
+        '<leader>du',
+        function()
+          require('dapui').toggle()
+        end,
+
+        desc = 'Open [D]ebug [U]i',
+      },
+      {
+        '<leader>dws',
+        function()
+          local widgets = require 'dap.ui.widgets'
+          local my_sidebar = widgets.sidebar(widgets.scopes)
+          my_sidebar.open()
+        end,
+        desc = 'Open [D]ebug [W]indow [S]copes',
+      },
+      {
+        '<leader>dwf',
+        function()
+          local widgets = require 'dap.ui.widgets'
+          local my_sidebar = widgets.sidebar(widgets.frames)
+          my_sidebar.open()
+        end,
+
+        desc = 'Open [D]ebug [W]indow [F]rames',
+      },
+      {
+        '<leader>dwi',
+        function()
+          local widgets = require 'dap.ui.widgets'
+          local my_sidebar = widgets.sidebar(widgets.sessions)
+          my_sidebar.open()
+        end,
+        desc = 'Open [D]ebug [W]indow sess[I]ons',
+      },
+      {
+        '<leader>dwt',
+        function()
+          local widgets = require 'dap.ui.widgets'
+          local my_sidebar = widgets.sidebar(widgets.threads)
+          my_sidebar.open()
+        end,
+        desc = 'Open [D]ebug [W]indow [T]hreads',
+      },
+      {
+        '<leader>dwe',
+        function()
+          local widgets = require 'dap.ui.widgets'
+          local my_sidebar = widgets.sidebar(widgets.expression)
+          my_sidebar.open()
+        end,
+
+        desc = 'Open [D]ebug [W]indow [E]xpression',
+      },
+    },
     dependencies = {
       'mfussenegger/nvim-dap',
       'nvim-neotest/nvim-nio',