diff --git a/template/flake.nix b/template/flake.nix
index c789f1e..57ab9bc 100644
--- a/template/flake.nix
+++ b/template/flake.nix
@@ -6,54 +6,60 @@
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
   outputs = { self, flake-utils, devshell, nixpkgs }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-        };
-      in
-      {
-        # Internal utility package with shell function and env vars helper.
-        # These get source'd in devshell.bash.extra when starting tritonshell
-        packages = {
-          triton-utils = import ./pkgs/triton-utils.nix { inherit pkgs; };
-          triton-docker-env =
+    flake-utils.lib.eachSystem [
+      "aarch64-linux"
+      "i686-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ]
+      (system:
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+          };
+        in
+        {
+          # Internal utility package with shell function and env vars helper.
+          # These get source'd in devshell.bash.extra when starting tritonshell
+          packages = {
+            triton-utils = import ./pkgs/triton-utils.nix { inherit pkgs; };
+            triton-docker-env =
+              let
+                # CUSTOMIZE:
+                # variables used to set triton env vars in tritonshell
+                # adjust to suit your Triton Data Center setup
+                # take a look at ./pkgs/triton-docker-env-shell.nix to see how these get used
+                cnsBaseDomain = "greenbaum.zone";
+                dataCenters = [ "cgn-1" "lev-1" ];
+                mantaDomain = "eu-central.manta.greenbaum.cloud";
+                tritonApiDomain = "api.greenbaum.cloud";
+              in
+              import ./pkgs/triton-docker-env.nix {
+                inherit pkgs cnsBaseDomain dataCenters mantaDomain tritonApiDomain;
+              };
+          };
+
+          devShells.default =
             let
-              # CUSTOMIZE:
-              # variables used to set triton env vars in tritonshell
-              # adjust to suit your Triton Data Center setup
-              # take a look at ./pkgs/triton-docker-env-shell.nix to see how these get used
-              cnsBaseDomain = "greenbaum.zone";
-              dataCenters = [ "cgn-1" "lev-1" ];
-              mantaDomain = "eu-central.manta.greenbaum.cloud";
-              tritonApiDomain = "api.greenbaum.cloud";
-            in
-            import ./pkgs/triton-docker-env.nix {
-              inherit pkgs cnsBaseDomain dataCenters mantaDomain tritonApiDomain;
-            };
-        };
+              pkgs = import nixpkgs {
+                inherit system;
 
-        devShells.default =
-          let
-            pkgs = import nixpkgs {
-              inherit system;
+                overlays = [
+                  devshell.overlay
+                  (import ./overlay.nix)
+                ];
+              };
 
-              overlays = [
-                devshell.overlay
-                (import ./overlay.nix)
+              # HINT: add your extra devshell pkgs here, use any packages you want
+              # available in your devshell's PATH
+              # Use https://search.nixos.org/packages to find available packages
+              # in the unstable channel
+              # These get appended to devshell.packages in ./tritonshell.nix
+              extraDevshellPkgs = with pkgs; [
+                #hello
               ];
-            };
 
-            # HINT: add your extra devshell pkgs here, use any packages you want
-            # available in your devshell's PATH
-            # Use https://search.nixos.org/packages to find available packages
-            # in the unstable channel
-            # These get appended to devshell.packages in ./tritonshell.nix
-            extraDevshellPkgs = with pkgs; [
-              #hello
-            ];
-
-          in
-          import ./tritonshell.nix { inherit extraDevshellPkgs devshell pkgs self system; };
-      });
+            in
+            import ./tritonshell.nix { inherit extraDevshellPkgs devshell pkgs self system; };
+        });
 }