diff --git a/flake.nix b/flake.nix
index 828e53c..4c8d7d3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -108,8 +108,13 @@
 			};
 		};
 
-		defaultPackage."x86_64-linux" = inputs.self.nixosConfigurations.iso.config.system.build.isoImage;
-		defaultPackage."x86_64-darwin" = inputs.self.darwinConfigurations.C02G48H8MD6R.system;
+		#"x86_64-linux" = inputs.self.nixosConfigurations.iso.config.system.build.isoImage;
+		#"x86_64-darwin" = inputs.self.darwinConfigurations.C02G48H8MD6R.system;
+		defaultPackage = {
+			"x86_64-linux" = inputs.self.homeConfigurations."x86_64-gui".activationPackage;
+			"aarch64-linux" = inputs.self.homeConfigurations."aarch64-gui".activationPackage;
+			"x86_64-darwin" = inputs.self.homeConfigurations."x86_64-darwin".activationPackage;
+		};
 
 		homeConfigurations = (
 			import ./home {
diff --git a/garnix.yaml b/garnix.yaml
index 8c3b37a..1c2f208 100644
--- a/garnix.yaml
+++ b/garnix.yaml
@@ -4,9 +4,8 @@ builds:
     - '*.aarch64-linux.*'
     - nixosConfigurations.*
     - defaultPackage.x86_64-linux
-    - homeConfigurations.x86_64-gui
-    - homeConfigurations.x86_64-nogui.activationPackage
-    - darwinConfigurations.*
+    - defaultPackage.aarch64-linux
+    - defaultPackage.x86_64-darwin
+    - darwinConfigurations.C02G48H8MD6R
   exclude:
     - nixosConfigurations.linode  # Requires decrypted files
-    #- nixosConfigurations.2maccabees  # Raspberry Pi 4