diff --git a/flake.nix b/flake.nix
index 528811d..70cd0ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
 
   outputs = { self, nixpkgs, flake-utils }:
-    rec {
+    {
       overlay = import ./overlay.nix;
 
       templates = {
@@ -13,30 +13,27 @@
           path = ./templates/app;
           description = "An example of a NixOS container";
         };
+        default = self.templates.app;
       };
 
-      defaultTemplate = templates.app;
-
     } // (flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; };
+        poetry2nix = import ./default.nix { inherit pkgs poetry; };
+      in
       rec {
-        packages =
-          let
-            pkgs = nixpkgs.legacyPackages.${system};
-            poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; };
-            poetry2nix = import ./default.nix { inherit pkgs poetry; };
-          in
-          {
-            inherit poetry;
-            poetry2nix = poetry2nix.cli;
-          };
+        packages = {
+          inherit poetry;
+          poetry2nix = poetry2nix.cli;
+          default = poetry2nix.cli;
+        };
 
-        defaultPackage = packages.poetry2nix;
 
         apps = {
           poetry = flake-utils.lib.mkApp { drv = packages.poetry; };
           poetry2nix = flake-utils.lib.mkApp { drv = packages.poetry2nix; };
+          default = apps.poetry2nix;
         };
-
-        defaultApp = apps.poetry2nix;
       }));
 }