diff --git a/lazy-lock.json b/lazy-lock.json
index 9b1482c..5aea9df 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -27,7 +27,6 @@
   "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" },
   "everforest-nvim": { "branch": "main", "commit": "a2de6a58e8fa389fa239c51f416b72fd01a02175" },
   "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
-  "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" },
   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
   "gruvbox-baby": { "branch": "main", "commit": "ea71b4225d0140103d99748ca4a33ecf22c03f62" },
   "gruvbox.nvim": { "branch": "main", "commit": "4176b0b720db0c90ab4030e5c1b4893faf41fd51" },
@@ -37,6 +36,7 @@
   "lazygit.nvim": { "branch": "main", "commit": "1e08e3f5ac1152339690140e61a4a32b3bdc7de5" },
   "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
+  "luasnip-snippets": { "branch": "main", "commit": "c948a463195515bef9468bfffe37552d3594c27c" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" },
   "mason.nvim": { "branch": "main", "commit": "baf99d94c3380640d19af9c70c0541bd6e7cd0cb" },
   "monokai-pro.nvim": { "branch": "master", "commit": "f3200bf058202089315c09a5060f386fe8ce94e9" },
diff --git a/lua/plugins/luasnip-snippets.lua b/lua/plugins/luasnip-snippets.lua
new file mode 100644
index 0000000..1d2e3d2
--- /dev/null
+++ b/lua/plugins/luasnip-snippets.lua
@@ -0,0 +1,9 @@
+return {
+  'mireq/luasnip-snippets',
+  dependencies = { 'L3MON4D3/LuaSnip' },
+  init = function()
+    -- Mandatory setup function
+    require('luasnip_snippets.common.snip_utils').setup()
+  end
+
+}
diff --git a/lua/plugins/luasnip.lua b/lua/plugins/luasnip.lua
index c8d4a6d..486b623 100644
--- a/lua/plugins/luasnip.lua
+++ b/lua/plugins/luasnip.lua
@@ -2,6 +2,15 @@ return {
   'L3MON4D3/LuaSnip',
   config = function()
     local ls = require('luasnip')
+    ls.setup({
+      -- Required to automatically include base snippets, like "c" snippets for "cpp"
+      load_ft_func = require('luasnip_snippets.common.snip_utils').load_ft_func,
+      ft_func = require('luasnip_snippets.common.snip_utils').ft_func,
+      -- To enable auto expansin
+      enable_autosnippets = true,
+      -- Uncomment to enable visual snippets triggered using <c-x>
+      store_selection_keys = '<c-x>',
+    })
     -- some shorthands...
     local s = ls.snippet
     local sn = ls.snippet_node
@@ -58,9 +67,5 @@ return {
     require('luasnip.loaders.from_vscode').lazy_load()
     require('luasnip.loaders.from_vscode').lazy_load({ paths = { './my-snippets' } })
   end,
-  dependencies =
-  {
-    'rafamadriz/friendly-snippets'
-  },
   cmd = 'LuaSnipListAvailable'
 }