diff --git a/defaults/threema b/defaults/threema
index 730ebce..c8a15fa 160000
--- a/defaults/threema
+++ b/defaults/threema
@@ -1 +1 @@
-Subproject commit 730ebce63dea4fb3eed6432b9b5dcd610e5b1de5
+Subproject commit c8a15fae4a6bec1c2a3cbd4065fa3c0f7cf8bdb0
diff --git a/flake.lock b/flake.lock
index 956eed1..10d7735 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648834319,
-        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
+        "lastModified": 1649711426,
+        "narHash": "sha256-tn5Hu9QkG6LhdgEOe+6cmULPeRCW0UY4o/GHU0viLu0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
+        "rev": "7049cf37a90e19ead7a379ce1c76dccea29450c4",
         "type": "github"
       },
       "original": {
@@ -153,7 +153,7 @@
         ]
       },
       "locked": {
-        "narHash": "sha256-Z4q+KnV4c28TVC7Hmn5fTn5nPd6LhBzL4iwDBAFa8Lo=",
+        "narHash": "sha256-PkbfwcRwiMkVSQuP9KBruXCmmyzuJ7/jIxmr3/rE3Ts=",
         "path": "/etc/nixos/defaults/threema",
         "type": "path"
       },
diff --git a/home/fhauser/applications/git.nix b/home/fhauser/applications/git.nix
index f67c853..8559a6c 100644
--- a/home/fhauser/applications/git.nix
+++ b/home/fhauser/applications/git.nix
@@ -55,8 +55,10 @@
       log.follow = true;
       rerere.enabled = true;
     };
+    ignores = [ "*~" "*.swp" ".direnv/" ];
+    lfs.enable = true;
     includes = let
-      mkDefaultConfig = (dir: {
+      mkConfig = (dir: {
         condition = "gitdir:${dir}";
         contents = {
           user = {
@@ -66,27 +68,12 @@
           };
         };
       });
-      workConfig = {
-        contents = {
-          commit.gpgsign = true;
-          tag.gpgsign = true;
-          user = {
-            signingkey = "0xE0CDD70E5D286D64";
-            email = "fabian.hauser@threema.ch";
-          };
-          url."git@work.github.com".insteadOf = "git@github.com";
-        };
-      };
-    in [
-      (mkDefaultConfig "~/private/")
-      (mkDefaultConfig "/etc/nixos/")
-      (mkDefaultConfig "~/.password-store/")
-      (mkDefaultConfig "~/shares/cloud.qo.is/")
-      (mkDefaultConfig "~/shares/drive.switch.ch/")
-      ((mkDefaultConfig "~/work/") // workConfig)
-      ((mkDefaultConfig "~/shares/cloud.threema.ch/") // workConfig)
+    in map mkConfig [
+      "~/private/"
+      "/etc/nixos/"
+      "~/.password-store/"
+      "~/shares/cloud.qo.is/"
+      "~/shares/drive.switch.ch/"
     ];
-    ignores = [ "*~" "*.swp" ".direnv/" ];
-    lfs.enable = true;
   };
 }