diff --git a/.gitattributes b/.gitattributes
index 1c8be0a..8ac8cd8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-modules/secrets/** filter=git-crypt diff=git-crypt
+modules/secrets/** filter=crypt diff=crypt merge=crypt
diff --git a/modules/secrets/Freight-20240828T164047Z-001.zip b/modules/secrets/Freight-20240828T164047Z-001.zip
index cffad6c..64df740 100644
Binary files a/modules/secrets/Freight-20240828T164047Z-001.zip and b/modules/secrets/Freight-20240828T164047Z-001.zip differ
diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix
index 693ab7c..4d6c3b6 100644
Binary files a/modules/secrets/default.nix and b/modules/secrets/default.nix differ
diff --git a/modules/system/system.nix b/modules/system/system.nix
index 0262384..80507d3 100644
--- a/modules/system/system.nix
+++ b/modules/system/system.nix
@@ -28,13 +28,16 @@ in
           dconf
           direnv
           git
-          git-crypt # Secrets management
           gnutar
           gzip
           home-manager
           openssh
           sudo
           xz.bin
+          # Packages required for decrypting config files
+          transcrypt
+          openssl
+          xxd
         ];
       };