diff --git a/.config/environment.d/30-ssh.conf b/.config/environment.d/30-ssh.conf
new file mode 100644
index 0000000..e9ce359
--- /dev/null
+++ b/.config/environment.d/30-ssh.conf
@@ -0,0 +1 @@
+SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gcr/ssh
diff --git a/.config/git/config b/.config/git/config
index de9572b..4faae7e 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -37,6 +37,9 @@
 [diff]
   submodule = log
 
+[gpg "ssh"]
+  allowedSignersFile = ~/.config/git/allowed_signers
+
 [grep]
   lineNumber = true
   extendRegexp = true
@@ -53,22 +56,22 @@
   rebase = true
 
 [includeIf "gitdir:~/Documents/Uni/"]
-  path = ~/.gitconfigs/.gitconfig-uni
+  path = ~/.config/git/subconfigs/uni
 
 [includeIf "gitdir:~/Repositories/uni/"]
-  path = ~/.gitconfigs/.gitconfig-uni
+  path = ~/.config/git/subconfigs/uni
 
 [includeIf "gitdir:~/Repositories/gitlab_com/"]
-  path = ~/.gitconfigs/.gitconfig-gitlab_com
+  path = ~/.config/git/subconfigs/gitlab_com
 
 [includeIf "gitdir:~/Repositories/saibotk_de/"]
-  path = ~/.gitconfigs/.gitconfig-saibotk_de
+  path = ~/.config/git/subconfigs/histalek_de
 
 [includeIf "gitdir:~/Repositories/histalek_de/"]
-  path = ~/.gitconfigs/.gitconfig-histalek_de
+  path = ~/.config/git/subconfigs/histalek_de
 
 [includeIf "gitdir:~/.dotfiles/"]
-  path = ~/.gitconfigs/.gitconfig-histalek_de
+  path = ~/.config/git/subconfigs/histalek_de
 
 [init]
   defaultBranch = main
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
new file mode 100644
index 0000000..5d19d34
--- /dev/null
+++ b/.gnupg/gpg-agent.conf
@@ -0,0 +1 @@
+pinentry-program /usr/bin/pinentry-gnome3