diff --git a/flake.nix b/flake.nix
index 7a28ba99..88112919 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,6 +73,8 @@
 
         channelsConfig = { allowUnfree = true; };
 
+        supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
+
         channels = {
           nixos = {
             imports = [ (digga.lib.importOverlays ./overlays) ];
@@ -128,6 +130,7 @@
             };
             suites = with profiles; rec {
               base = [ core users.pub-solar users.root ];
+              iso = base ++ [ base-user graphical pub-solar-iso ];
               pubsolaros = [ core full-install base-user users.root ];
               anonymous = [ pubsolaros users.pub-solar ];
             };
diff --git a/hosts/PubSolarOS.nix b/hosts/PubSolarOS.nix
index 2438ac28..70cf7a08 100644
--- a/hosts/PubSolarOS.nix
+++ b/hosts/PubSolarOS.nix
@@ -1,15 +1,10 @@
-{ profiles, ... }:
+{ suites, ... }:
 {
   ### root password is empty by default ###
-  imports = [
-    # profiles.networking
-    profiles.core
-    profiles.users.root # make sure to configure ssh keys
-    profiles.users.pub-solar
-    profiles.base-user
-    profiles.graphical
-    profiles.pub-solar-iso
-  ];
+  ### default password: pub-solar, optional: add your SSH keys
+  imports =
+    suites.iso
+  ;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;