diff --git a/.gitignore b/.gitignore
index ed921c9..6ba475c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,10 @@ tmux/*
 git/*
 !git/config
 !git/ignore
-!git/aflabs
+!git/config.d
+git/config.d/*
+!git/config.d/aflabs.conf
+!git/config.d/flare.conf
 
 # ghostty
 !ghostty
diff --git a/git/config b/git/config
index 53b9894..ed2875c 100644
--- a/git/config
+++ b/git/config
@@ -1,12 +1,3 @@
-[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
-	path = ~/.config/git/config.d/aflabs.conf
-
-[includeIf "gitdir:~/Desktop/git/gitlab.com/flarenetwork"]
-	path = ~/.config/git/config.d/flare.conf
-
-[includeIf "gitdir:~/Desktop/git/gitlab.com/flare-foundation"]
-	path = ~/.config/git/config.d/flare.conf
-
 [user]
 	name = Matej Janežič
 	email = janezic.mj@gmail.com
@@ -54,3 +45,12 @@
 
 [mergetool "nvimdiff"]
 	layout = "LOCAL,BASE,REMOTE / MERGED"
+
+[includeIf "gitdir:~/git/git.aflabs.org/**"]
+	path = ~/.config/git/config.d/aflabs.conf
+
+[includeIf "gitdir:~/git/gitlab.com/flarenetwork/**"]
+	path = ~/.config/git/config.d/flare.conf
+
+[includeIf "gitdir:~/git/gitlab.com/flare-foundation/**"]
+	path = ~/.config/git/config.d/flare.conf
diff --git a/git/config.d/aflabs.conf b/git/config.d/aflabs.conf
new file mode 100644
index 0000000..ad46587
--- /dev/null
+++ b/git/config.d/aflabs.conf
@@ -0,0 +1,2 @@
+[user]
+	email = matej.janezic@aflabs.com
diff --git a/git/config.d/flare.conf b/git/config.d/flare.conf
new file mode 100644
index 0000000..9e6a936
--- /dev/null
+++ b/git/config.d/flare.conf
@@ -0,0 +1,2 @@
+[user]
+	email = matej@flare.network