diff --git a/nixos/cachix.nix b/nixos/cachix.nix
index 64734c30..063fdc3e 100644
--- a/nixos/cachix.nix
+++ b/nixos/cachix.nix
@@ -9,5 +9,5 @@ let
     (lib.filterAttrs filterCaches (builtins.readDir folder));
 in {
   inherit imports;
-  nix.binaryCaches = [ "https://cache.nixos.org/" ];
+  nix.settings.substituters = [ "https://cache.nixos.org/" ];
 }
diff --git a/nixos/cachix/nix-community.nix b/nixos/cachix/nix-community.nix
index 427a518b..71099c25 100644
--- a/nixos/cachix/nix-community.nix
+++ b/nixos/cachix/nix-community.nix
@@ -1,10 +1,10 @@
 
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://nix-community.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index bb4c348a..8b030539 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -25,7 +25,7 @@
     # Auto garbage-collect and optimize store
     gc.automatic = true;
     gc.options = "--delete-older-than 5d";
-    autoOptimiseStore = true;
+    settings.auto-optimise-store = true;
     optimise.automatic = true;
 
     # TODO: Understand this