diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 9de19078c10..b69df4a87ce 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -26,13 +26,12 @@ with pkgs.lib;
 
     environment.shellInit =
       ''
-        export TZDIR=${pkgs.tzdata}/share/zoneinfo
+        export TZDIR=/etc/zoneinfo
       '';
 
-    environment.etc = singleton
-      { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
-        target = "localtime";
-      };
+    environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
+
+    environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo";
 
   };