diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2b96a5e1..d2dcf4d9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,4 +1,5 @@
 name: CI
+
 on:
   push:
   workflow_dispatch:
@@ -6,16 +7,24 @@ on:
     types: [opened]
 
 jobs:
-  tests:
+  eval:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v17
-        with:
-          install_url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.8.0pre20220311_d532269/install
+      - uses: nixbuild/nix-quick-install-action@v25
+      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       # Quick eval
       - run: nix develop --command evalnix
+      # Check formatting
+      - run: nix develop --command fmt --check
+
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: nixbuild/nix-quick-install-action@v25
+      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       # Execute /tests/*
       - run: nix develop --command check-derivation-outputs
@@ -23,6 +32,13 @@ jobs:
       - run: nix develop --command check-overlays-flow
       - run: nix develop --command check-hosts-config
 
+  build-examples:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: nixbuild/nix-quick-install-action@v25
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+
       # Build /examples/*
       - run: nix develop --command build-home-manager+nur+neovim-Rick
       - run: nix develop --command build-minimal-multichannel-Hostname1
@@ -30,5 +46,3 @@ jobs:
       - run: nix develop --command build-exporters-Morty
       - run: nix develop --command build-darwin
 
-      # Check formatting
-      - run: nix develop --command fmt --check
diff --git a/examples/darwin/flake.nix b/examples/darwin/flake.nix
index 158620f7..81473b19 100644
--- a/examples/darwin/flake.nix
+++ b/examples/darwin/flake.nix
@@ -2,7 +2,7 @@
   description = "A highly awesome system configuration.";
 
   inputs = {
-    nixpkgs.url = github:nixos/nixpkgs/release-21.05;
+    nixpkgs.url = github:nixos/nixpkgs/nixos-unstable-small;
     utils.url = path:../../;
     darwin.url = "github:lnl7/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/examples/exporters/flake.nix b/examples/exporters/flake.nix
index 72580288..6071788c 100644
--- a/examples/exporters/flake.nix
+++ b/examples/exporters/flake.nix
@@ -2,7 +2,7 @@
   description = "FUP exporters demo";
 
   inputs = {
-    nixpkgs.url = github:nixos/nixpkgs/release-21.05;
+    nixpkgs.url = github:nixos/nixpkgs/nixos-unstable-small; # Lets pretend that this is a stable channel
     unstable.url = github:nixos/nixpkgs/nixos-unstable-small;
     utils.url = path:../../;
   };
diff --git a/examples/home-manager+nur+neovim/flake.nix b/examples/home-manager+nur+neovim/flake.nix
index 592f76e5..f6e4d461 100644
--- a/examples/home-manager+nur+neovim/flake.nix
+++ b/examples/home-manager+nur+neovim/flake.nix
@@ -13,7 +13,7 @@
     };
 
     home-manager = {
-      url = github:nix-community/home-manager/release-21.05;
+      url = github:nix-community/home-manager;
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/examples/minimal-multichannel/flake.nix b/examples/minimal-multichannel/flake.nix
index e1dc186a..5da68165 100644
--- a/examples/minimal-multichannel/flake.nix
+++ b/examples/minimal-multichannel/flake.nix
@@ -2,8 +2,8 @@
   description = "A highly awesome system configuration.";
 
   inputs = {
-    nixpkgs.url = github:nixos/nixpkgs/release-21.05;
-    unstable.url = github:nixos/nixpkgs/nixos-unstable;
+    nixpkgs.url = github:nixos/nixpkgs/nixos-unstable-small; # Lets pretend that this is a stable channel
+    unstable.url = github:nixos/nixpkgs/nixos-unstable-small;
     utils.url = path:../../;
   };
 
diff --git a/lib/mkFlake.nix b/lib/mkFlake.nix
index 88fab32f..5d5ae39d 100644
--- a/lib/mkFlake.nix
+++ b/lib/mkFlake.nix
@@ -235,8 +235,8 @@ mergeAny otherArguments (
       { inherit pkgs; }
       // (foldl' mkOutputs { } (attrNames systemOutputs))
     )
-  # produces attrset in the shape of
-  # { nixosConfigurations = {}; darwinConfigurations = {};  ... }
-  # according to profile.output or the default `nixosConfigurations`
-  // foldl' mergeAny { } (attrValues (mapAttrs configurationBuilder hosts))
+    # produces attrset in the shape of
+    # { nixosConfigurations = {}; darwinConfigurations = {};  ... }
+    # according to profile.output or the default `nixosConfigurations`
+    // foldl' mergeAny { } (attrValues (mapAttrs configurationBuilder hosts))
 )