diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index fcb3e6d..32cb0c5 100755
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -66,6 +66,41 @@ return {
             opts.desc = "Restart LSP"
             keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts)
 
+            -- Keybinds for testing, refactoring, java specific
+            opts.desc = "Java profiling"
+            keymap.set("n", "<leader>jp", ":JavaProfile<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Variable (create variable from cursor)"
+            keymap.set("n", "<leader>jev", ":JavaExtractVariable<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Variable all occurrences (create variable from cursor)"
+            keymap.set("n", "<leader>jea", ":JavaExtractVariableAllOccurrence<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Const (create const from cursor)"
+            keymap.set("n", "<leader>jec", ":JavaExtractConst<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Method (create method from cursor)"
+            keymap.set("n", "<leader>jev", ":JavaExtractMethod<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Field (create field from cursor)"
+            keymap.set("n", "<leader>jev", ":JavaExtractField<CR>", opts)
+
+            -- Java testing, Debugging
+            opts.desc = "Java Testing: Run test class in buffer"
+            keymap.set("n", "<leader>jtc", ":JavaTestRunCurrentClass<CR>", opts)
+
+            opts.desc = "Java Testing: Debug test class in buffer"
+            keymap.set("n", "<leader>jdc", ":JavaTestDebugCurrentClass<CR>", opts)
+
+            opts.desc = "Java Testing: Run current method in buffer"
+            keymap.set("n", "<leader>jtm", ":JavaTestRunCurrentMethod<CR>", opts)
+
+            opts.desc = "Java Testing: Debug current method in buffer"
+            keymap.set("n", "<leader>jdm", ":JavaTestDebugCurrentMethod<CR>", opts)
+
+            opts.desc = "Java Testing: View last report"
+            keymap.set("n", "<leader>jtv", ":JavaTestViewLastReport<CR>", opts)
+
             vim.opt.signcolumn = "yes" -- reserve space for diagnostics
         end
 
@@ -132,50 +167,9 @@ return {
             on_attach = on_attach,
         })
 
-        local java_on_attach = function(client, bufnr)
-            opts.buffer = bufnr
-
-            -- Keybinds for testing, refactoring, java specific
-            opts.desc = "Java profiling"
-            keymap.set("n", "<leader>jp", ":JavaProfile<CR>", opts)
-
-            opts.desc = "Java Refactor: Extract Variable (create variable from cursor)"
-            keymap.set("n", "<leader>jev", ":JavaExtractVariable<CR>", opts)
-
-            opts.desc = "Java Refactor: Extract Variable all occurrences (create variable from cursor)"
-            keymap.set("n", "<leader>jea", ":JavaExtractVariableAllOccurrence<CR>", opts)
-
-            opts.desc = "Java Refactor: Extract Const (create const from cursor)"
-            keymap.set("n", "<leader>jec", ":JavaExtractConst<CR>", opts)
-
-            opts.desc = "Java Refactor: Extract Method (create method from cursor)"
-            keymap.set("n", "<leader>jev", ":JavaExtractMethod<CR>", opts)
-
-            opts.desc = "Java Refactor: Extract Field (create field from cursor)"
-            keymap.set("n", "<leader>jev", ":JavaExtractField<CR>", opts)
-
-            -- Java testing, Debugging
-            opts.desc = "Java Testing: Run test class in buffer"
-            keymap.set("n", "<leader>jtc", ":JavaTestRunCurrentClass<CR>", opts)
-
-            opts.desc = "Java Testing: Debug test class in buffer"
-            keymap.set("n", "<leader>jdc", ":JavaTestDebugCurrentClass<CR>", opts)
-
-            opts.desc = "Java Testing: Run current method in buffer"
-            keymap.set("n", "<leader>jtm", ":JavaTestRunCurrentMethod<CR>", opts)
-
-            opts.desc = "Java Testing: Debug current method in buffer"
-            keymap.set("n", "<leader>jdm", ":JavaTestDebugCurrentMethod<CR>", opts)
-
-            opts.desc = "Java Testing: View last report"
-            keymap.set("n", "<leader>jtv", ":JavaTestViewLastReport<CR>", opts)
-
-            on_attach(client, bufnr)
-        end
-
         lspconfig.jdtls.setup({
             capabilities = capabilities,
-            on_attach = java_on_attach,
+            on_attach = on_attach,
         })
 
         lspconfig.texlab.setup{