diff --git a/flake.nix b/flake.nix
index 67190b7..583fa6e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,10 @@
   inputs = {
     # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    nixpkgs-master.url = "github:nixos/nixpkgs/master";
+    nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/7e0f2ad1137468b04623a6f0f2bc98b9696241f4";
 
     home-manager = {
       url = "github:nix-community/home-manager/master";
@@ -22,7 +25,7 @@
     # Run unpatched dynamically compiled binaries
     nix-ld = {
       url = "github:Mic92/nix-ld";
-      inputs.nixpkgs.follows = "unstable";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
     ###
@@ -48,7 +51,7 @@
 
     snowfall-flake = {
       url = "github:snowfallorg/flake";
-      inputs.nixpkgs.follows = "unstable";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
     kickstartnvim = {
diff --git a/modules/nixos/services/factorio-server/default.nix b/modules/nixos/services/factorio-server/default.nix
index 9e501e4..62f014d 100644
--- a/modules/nixos/services/factorio-server/default.nix
+++ b/modules/nixos/services/factorio-server/default.nix
@@ -16,7 +16,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ factorio-headless ];
+    environment.systemPackages = with pkgs; [ pkgs.factorio-headless ];
     sops = {
       secrets = {
         factorio_token = {
@@ -31,7 +31,7 @@ in
       };
       templates."extraSettingsFile.json".content = ''
         {
-          "name": "Alles Nix!",
+          "name": "SpaceAge",
           "description": "Trying to run a factorio-headless-server on my nix system",
           "tags": ["vanilla"],
           "max_players": 10,
@@ -54,7 +54,7 @@ in
       lan = true;
       nonBlockingSaving = true;
       autosave-interval = 5;
-      loadLatestSave = true;
+      saveName = "SpaceAge";
       extraSettingsFile = config.sops.templates."extraSettingsFile.json".path;
     };
   };
diff --git a/overlays/factorio-headless/default.nix b/overlays/factorio-headless/default.nix
new file mode 100644
index 0000000..98e4327
--- /dev/null
+++ b/overlays/factorio-headless/default.nix
@@ -0,0 +1,3 @@
+{ channels, ... }:
+
+final: prev: { inherit (channels.nixpkgs-latest-factorio) factorio-headless; }
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 98be30a..630bfc8 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -1,7 +1,7 @@
 #ENC[AES256_GCM,data:Y75QxOB7YrOA,iv:mZ2f288IG/pmlQRtCqdcz03dDTYMnnj50Vsk/BwTJ+c=,tag:gPHZgq091G4LYMan9R6z1w==,type:comment]
 factorio_username: ENC[AES256_GCM,data:rI7vF0XlaQ==,iv:+d5dD+nawphw+g8zavFXUr87bewTL1d+fuFnYKuYJKc=,tag:B8/6I7zi0b6xo8TFsY35Ug==,type:str]
 factorio_token: ENC[AES256_GCM,data:0JOQv4UGiz2j2KPEoNm2IuE3qt8XfKuVEBWJ2+fF,iv:EUc8vhrB5NcgFKO7xTCxG2PzUuFCJFIl1KB90NqCOXw=,tag:rCilwxD8sw+Ql5HzvcUEJQ==,type:str]
-factorio_game_password: ENC[AES256_GCM,data:wwmltZzhYlQ=,iv:2LPugIqfPLJ5PbdrVfI36+76pAVp5Rano4T6968OsKs=,tag:kRpWL4wYnm/X4SHYypzVyA==,type:str]
+factorio_game_password: ENC[AES256_GCM,data:xMpORLbom/w=,iv:ukkPL10vAcQKGGpjqKM58uIfJ3sRLhxUkFyf0JXJkvc=,tag:jw52z23utK7eHM9e2zZvig==,type:str]
 nixpkgs_review_auth: ENC[AES256_GCM,data:4zd7nThKhMMQxuxVdGZFUyJJ3rDBC29h9ydGmjKBEFy9Lz5X9TCf3w==,iv:u3aasLXSqer50RZDvvwGr0mwEoyywWaMr6q9VhPZieg=,tag:/rfQ4LHfJsvFYH+4hBe4LQ==,type:str]
 sops:
     kms: []
@@ -18,8 +18,8 @@ sops:
             TzdjVjVtWmxNNm96WHhXSGM4WjErMkEKoGtyn6M91h+ye8U/ltOuOQ74RUo/2R37
             l5vR47FUyzilUliIK2PDUMXM/S3Yk3Zi6g3XL8OPd53X5I1UYUJmRw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-06T19:21:22Z"
-    mac: ENC[AES256_GCM,data:xgRgCRNtsoa3h7ss9uUyOVmGWoQqZ8+vSk0sNkhOeev1tB9qesTnkqNfRkilRyZPNen5xTV8iupvlB4wLVjODGDLueaimnOjWxrk8urSLPEbCzjLUsWuWiVANIkkyGWn0KH4mxr4pR0lt+Yy2JRKuzKGPYKYHWwnCg1saVCC2VE=,iv:iu86TvF8ur8RALGkJTgam35kJ4QRx6ruMBnj7o99A8k=,tag:AY/hCByZd1SNVIrWZ4qp4A==,type:str]
+    lastmodified: "2024-10-22T00:06:22Z"
+    mac: ENC[AES256_GCM,data:NFP/q1AwapApQ7osBUIIQRfwuD5CbZphZkxLo1BfnUG7q/TxLbUm7F1uDaHFx55ox7FrvBzm11k/A8njcOQtpmfnBGhwF+X6VUF+CvsnTStRk/4v1TiybFFODSPKVmsZvxKJS1cRnTmptBvDoDfztIvqk4m9XvuVZlYvK5VXQVA=,iv:z61xn9BYygcD5t/z0ZO7yUSS+yFOUNvmcSSx+c1RgAQ=,tag:u1/P68g2jemJhOloZHB7yA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.9.1