diff --git a/flake.lock b/flake.lock
index 8fe8922e..9a2e9eb4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,20 +54,20 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-stable"
         ]
       },
       "locked": {
-        "lastModified": 1622407737,
-        "narHash": "sha256-nmPEv1khCD7x1DIJPmTG6HBsqAgga6P/kpOx2yPQfxM=",
+        "lastModified": 1622312560,
+        "narHash": "sha256-xBWgiwnPaL/iZasPxw3BuvPAee/2jiToiZjKvKLs+PA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0e329cee4c17fa0b7df32233513b9cb2236d382b",
+        "rev": "ab64dc32493996c24607eab2cae6663466ddfb8a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-21.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -85,23 +85,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1622364474,
-        "narHash": "sha256-bRupByHizbCba3/AgaETL+YySowmfssqWl7+p0jwcPU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "eae0cabc124702e04bb2098070ca46d661543d29",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-20.09",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
+    "nixpkgs-nixos-unstable": {
       "locked": {
         "lastModified": 1622282707,
         "narHash": "sha256-+GOrUDsdneUqrOm9d+9bHXjEVoVcU8tm14WGVzbt6gg=",
@@ -117,6 +101,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1622449420,
+        "narHash": "sha256-aKDhIaJqNUy7p3urHEBC/mdIAJWckhW3Fgzmv284UHg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1622409301,
@@ -139,7 +139,7 @@
         "bisq": "bisq",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur"
       }
diff --git a/flake.nix b/flake.nix
index 3616c018..935f480a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   description = "NixOS configuration with flakes";
-  outputs = { self, flake-utils, home-manager, nixpkgs, nixpkgs-stable, nur, bisq, agenix } @ inputs: {
+  outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nur, bisq, agenix } @ inputs: {
     nixosConfigurations = {
-      foureighty = nixpkgs.lib.nixosSystem {
+      foureighty = nixpkgs-stable.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           (import ./nixos/boxes/foureighty)
@@ -17,7 +17,7 @@
         ];
         specialArgs = { inherit inputs; };
       };
-      skinnyv = nixpkgs.lib.nixosSystem {
+      skinnyv = nixpkgs-stable.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           (import ./nixos/boxes/skinnyv)
@@ -43,7 +43,7 @@
     };
   };
   inputs = {
-    nixpkgs = {
+    nixpkgs-nixos-unstable = {
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
@@ -54,16 +54,16 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "nixos-20.09";
+      ref = "nixos-21.05";
     };
 
     home-manager = {
       type = "github";
       owner = "nix-community";
       repo = "home-manager";
-      ref = "master";
+      ref = "release-21.05";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs-stable";
       };
     };