diff --git a/ansible/templates/workstation/.gitconfig.j2 b/ansible/templates/workstation/.gitconfig.j2
index ceb4381..a64a27b 100644
--- a/ansible/templates/workstation/.gitconfig.j2
+++ b/ansible/templates/workstation/.gitconfig.j2
@@ -24,13 +24,19 @@
 
 [merge]
   conflictstyle = diff3
-  tool = meld
+  tool = vscode
 
 [mergetool]
   prompt = false
 
+[mergetool "vscode"]
+  cmd = code --reuse-window --wait $MERGED
+
 [diff]
-  tool = meld
+  tool = vscode
+
+[difftool "vscode"]
+  cmd = code --reuse-window --wait --diff $LOCAL $REMOTE
 
 [color]
   ui = always