diff --git a/roles/dotfiles/files/vimrc b/roles/dotfiles/files/vimrc
index 6456323..cbbfdbd 100644
--- a/roles/dotfiles/files/vimrc
+++ b/roles/dotfiles/files/vimrc
@@ -23,7 +23,7 @@ augroup terraform
 augroup end
 augroup go
 	autocmd FileType go :set tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
-	autocmd FileType go nnoremap <F9> :GoFmt<CR>
+	au FileType go nmap <F9> <Plug>(go-fmt)<Plug>(go-lint)
 	au FileType go nmap <F7> <Plug>(go-build)
 	au FileType go nmap <F8> <Plug>(go-run)
 augroup end