diff --git a/Dockerfile b/Dockerfile
index a6f82eb..088f02e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -194,7 +194,14 @@ ARG GIT_USER_EMAIL
 ARG GIT_USER_NAME
 RUN git config --global user.email "${GIT_USER_EMAIL}" \
   && git config --global user.name "${GIT_USER_NAME}" \
-  && git config --global core.editor nvim
+  && git config --global core.editor nvim \
+  && git config --global diff.tool nvimdiff \
+  && git config --global difftool.nvimdiff.layout "LOCAL,REMOTE" \
+  && git config --global merge.tool nvimdiff \
+  && git config --global mergetool.nvimdiff.layout "LOCAL,BASE,REMOTE / MERGED" \
+  && git config --global includeIf."hasconfig:remote.*.url:gitea:*/**".path ${XDG_CONFIG_HOME}/git/personal_gitea \
+  && git config --global includeIf."hasconfig:remote.*.url:github:joaodubas/**".path ${XDG_CONFIG_HOME}/git/personal_github \
+  && git config --global includeIf."gitdir:/opt/work".path ${XDG_CONFIG_HOME}/git/work \
 
 COPY ./scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY ./scripts/elixir-ls-setup.sh /usr/local/bin/elixir-ls-setup