diff --git a/config/nvim/lua/fschauen/plugins/comment.lua b/config/nvim/lua/fschauen/plugins/comment.lua
index 38771c3..fca1a08 100644
--- a/config/nvim/lua/fschauen/plugins/comment.lua
+++ b/config/nvim/lua/fschauen/plugins/comment.lua
@@ -1,3 +1,9 @@
 return {
-  'numToStr/Comment.nvim',
+  'tpope/vim-commentary',
+  cmd = 'Commentary',
+  keys = {
+    { 'gc',  '<Plug>Commentary',    mode = { 'n', 'x', 'o' }, desc = 'Comment in/out' },
+    { 'gcc', '<Plug>CommentaryLine',             desc = 'Comment in/out line' },
+    { 'gcu', '<Plug>Commentary<Plug>Commentary', desc = 'Undo comment in/out' },
+  },
 }