diff --git a/home/config/git/config-work-nedeco b/home/config/git/config-work-nedeco
deleted file mode 100644
index eb76113..0000000
--- a/home/config/git/config-work-nedeco
+++ /dev/null
@@ -1,16 +0,0 @@
-[user]
-  email = "d.kempkens@nedeco.de"
-  name = "Daniel Kempkens"
-  signingKey = "~/.ssh/nedeco_gitlab.pub"
-
-[commit]
-  gpgsign = true
-
-[tag]
-  gpgsign = true
-
-[gpg]
-  format = "ssh"
-
-[gpg "ssh"]
-  allowedSignersFile = "~/.ssh/allowed_signers/work-nedeco"
diff --git a/home/config/git/config-work-wdw b/home/config/git/config-work-wdw
deleted file mode 100644
index 133af69..0000000
--- a/home/config/git/config-work-wdw
+++ /dev/null
@@ -1,9 +0,0 @@
-[user]
-  email = "d.kempkens@wdw-consulting.com"
-  name = "Daniel Kempkens"
-
-[commit]
-  gpgsign = false
-
-[tag]
-  gpgsign = false
diff --git a/home/programs/git.nix b/home/programs/git.nix
index a52a933..3c0ad84 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,9 +1,5 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
-let
-  config-work-nedeco = "${config.xdg.configHome}/git/config-work-nedeco";
-  config-work-wdw = "${config.xdg.configHome}/git/config-work-wdw";
-in
 {
   home.packages = [ pkgs.git-crypt ];
 
@@ -58,20 +54,57 @@ in
     ];
 
     includes = [
+      # Private
       {
-        path = "${config-work-nedeco}";
-        condition = "gitdir:~/Code/Work/";
+        condition = "hasconfig:remote.*.url:git@github.com:*/**";
+        contents = {
+          user = {
+            signingKey = "~/.ssh/GitHub.pub";
+          };
+
+          commit = {
+            gpgSign = true;
+          };
+
+          tag = {
+            gpgSign = true;
+          };
+
+          gpg = {
+            format = "ssh";
+          };
+        };
       }
 
+      # Work
       {
-        path = "${config-work-wdw}";
-        condition = "gitdir:~/Code/Work/WDW/";
+        condition = "hasconfig:remote.*.url:git@git.app.nedeco.de:*/**";
+        contents = {
+          user = {
+            email = "d.kempkens@nedeco.de";
+            name = "Daniel Kempkens";
+            signingKey = "~/.ssh/nedeco_gitlab.pub";
+          };
+
+          commit = {
+            gpgSign = true;
+          };
+
+          tag = {
+            gpgSign = true;
+          };
+
+          gpg = {
+            format = "ssh";
+          };
+
+          "gpg \"ssh\"" = {
+            allowedSignersFile = "~/.ssh/allowed_signers/work-nedeco";
+          };
+        };
       }
     ];
   };
 
   home.sessionVariables.GIT_CEILING_DIRECTORIES = "/Users";
-
-  home.file."${config-work-nedeco}".source = ../config/git/config-work-nedeco;
-  home.file."${config-work-wdw}".source = ../config/git/config-work-wdw;
 }