diff --git a/lazy-lock.json b/lazy-lock.json
index ffa1e04..fa488bd 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,10 +1,9 @@
 {
   "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" },
-  "blamer.nvim": { "branch": "master", "commit": "e0d43c11697300eb68f00d69df8b87deb0bf52dc" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "darcula": { "branch": "master", "commit": "faf8dbab27bee0f27e4f1c3ca7e9695af9b1242b" },
   "fidget.nvim": { "branch": "main", "commit": "f10103f8f30fed80a7ab07fff5756164fea87c70" },
-  "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" },
+  "gitsigns.nvim": { "branch": "fix-gitsigns-attach", "commit": "de13b6a64e4e43172a6678d05b18c3e6b5abf5e5" },
   "gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" },
   "harpoon": { "branch": "master", "commit": "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
diff --git a/lua/wangleng/plugins/git.lua b/lua/wangleng/plugins/git.lua
index 0bdb1db..5e785b3 100644
--- a/lua/wangleng/plugins/git.lua
+++ b/lua/wangleng/plugins/git.lua
@@ -10,15 +10,14 @@ return {
         end
     },
     -- Git added/modified/removed signs/lines at the line number guide
+    -- and git lens blame
     {
-        'lewis6991/gitsigns.nvim',
-        opts = {}
-    },
-    -- Git lens per line
-    {
-        'APZelos/blamer.nvim',
-        config = function()
-            vim.g.blamer_enabled = 1
-        end
+        -- TODO: Check whether `lewis6991/gitsigns.nvim` fixed the attach issue
+        -- https://github.com/lewis6991/gitsigns.nvim/issues/903
+        'yamgent/gitsigns.nvim',
+        branch = 'fix-gitsigns-attach',
+        opts = {
+            current_line_blame = true,
+        },
     },
 }