diff --git a/flakes/base/flake.nix b/flakes/base/flake.nix
index 0b83952..26530ba 100644
--- a/flakes/base/flake.nix
+++ b/flakes/base/flake.nix
@@ -1,11 +1,11 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils }:
-    utils.lib.eachDefaultSystem (system:
+  outputs = { self, nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
       in
diff --git a/flakes/haskell/flake.nix b/flakes/haskell/flake.nix
index 3cf5d75..8ad7da9 100644
--- a/flakes/haskell/flake.nix
+++ b/flakes/haskell/flake.nix
@@ -1,11 +1,11 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils }:
-    utils.lib.eachDefaultSystem (system:
+  outputs = { self, nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
         hPkgs = pkgs.haskellPackages;
diff --git a/flakes/jupyter/flake.nix b/flakes/jupyter/flake.nix
index 5f1c71f..758f37e 100644
--- a/flakes/jupyter/flake.nix
+++ b/flakes/jupyter/flake.nix
@@ -1,15 +1,16 @@
 {
   inputs = {
     jupyterWith.url = "github:tweag/jupyterWith";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, jupyterWith, utils }:
-    utils.lib.eachDefaultSystem (system:
+  outputs = { self, nixpkgs, jupyterWith, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
       let
+        inherit (builtins) attrValues;
         pkgs = import nixpkgs {
           inherit system;
-          overlays = builtins.attrValues jupyterWith.overlays;
+          overlays = attrValues jupyterWith.overlays;
         };
 
         # Source https://github.com/tweag/jupyterWith
diff --git a/starters/typescript/flake.nix b/starters/typescript/flake.nix
index ad5b5cc..3dbd7d1 100644
--- a/starters/typescript/flake.nix
+++ b/starters/typescript/flake.nix
@@ -1,11 +1,11 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils }:
-    utils.lib.eachDefaultSystem (system:
+  outputs = { self, nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
       in