diff --git a/nvim/.config/nvim/after/plugin/auto-session.lua b/nvim/.config/nvim/after/plugin/auto-session.lua
new file mode 100644
index 0000000..8aa98c2
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/auto-session.lua
@@ -0,0 +1,13 @@
+local opts = {
+  log_level                        = 'error',
+  auto_session_enable_last_session = false,
+  auto_session_root_dir            = vim.fn.expand('~/.vim/session/'),
+  auto_session_enabled             = true,
+  auto_session_create_enabled      = false,
+  auto_save_enabled                = true,
+  auto_restore_enabled             = true,
+  auto_session_suppress_dirs       = nil,
+  auto_session_allowed_dirs        = nil,
+}
+
+require('auto-session').setup(opts)
diff --git a/nvim/.config/nvim/after/plugin/workspace.lua b/nvim/.config/nvim/after/plugin/workspace.lua
deleted file mode 100644
index d1e2cd6..0000000
--- a/nvim/.config/nvim/after/plugin/workspace.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.g.workspace_session_directory       = vim.fn.expand('~/.vim/session/')
-vim.g.workspace_undodir                 = vim.fn.expand('~/.vim/undodir')
-vim.g.workspace_autosave                = 0
-vim.g.workspace_autosave_ignore         = {'gitcommit', 'qf', 'tagbar'}
-vim.g.workspace_session_disable_on_args = 1
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 6cce423..601f003 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -14,7 +14,7 @@ local init = function ()
   use 'junegunn/fzf.vim'
   use 'bronson/vim-visual-star-search'
   -- Manage Project sessions
-  use 'thaerkh/vim-workspace'
+  use 'rmagatti/auto-session'
   -- Snippets
   use {
     'L3MON4D3/LuaSnip',