diff --git a/flake.nix b/flake.nix
index 8392544..eb3b1b2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,10 +9,11 @@
 
   outputs = { self, nixos-unstable, nixos-stable }:
     let
-      supportedSystems = [ "aarch64-linux" "x86_64-linux" ];
+      supportedSystems = [ "riscv64-linux" ];
       forAllSystems = nixos-unstable.lib.genAttrs supportedSystems;
     in
     {
+      hydraJobs = { inherit (self) checks; };
       packages = forAllSystems (system:
         let
           netboot = nixpkgs: (import (nixpkgs + "/nixos/release.nix") { }).netboot.${system};
@@ -76,13 +77,6 @@
               kexec-installer-stable = nixos-stable.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix {
                 kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-stable-noninteractive;
               };
-              shellcheck = pkgsUnstable.runCommand "shellcheck"
-                {
-                  nativeBuildInputs = [ pkgsUnstable.shellcheck ];
-                } ''
-                shellcheck ${(pkgsUnstable.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun}
-                touch $out
-              '';
             } // (bootTests pkgsUnstable nixos-unstable "-nixos-unstable")
               // (bootTests pkgsStable nixos-stable "-nixos-stable");
         in
diff --git a/nix/installer.nix b/nix/installer.nix
index 45908c0..c850f9d 100644
--- a/nix/installer.nix
+++ b/nix/installer.nix
@@ -6,7 +6,7 @@
 }:
 {
   imports = [
-    ./latest-zfs-kernel.nix
+#    ./latest-zfs-kernel.nix
     ./nix-settings.nix
   ];
   # more descriptive hostname than just "nixos"
@@ -19,7 +19,7 @@
   boot.supportedFilesystems.bcachefs = lib.mkDefault true;
 
   # use latest kernel we can support to get more hardware support
-  boot.zfs.package = pkgs.zfsUnstable;
+#  boot.zfs.package = pkgs.zfsUnstable;
 
   documentation.enable = false;
   documentation.man.man-db.enable = false;
diff --git a/nix/noninteractive.nix b/nix/noninteractive.nix
index 41ae548..2cc44af 100644
--- a/nix/noninteractive.nix
+++ b/nix/noninteractive.nix
@@ -10,7 +10,7 @@
   ];
 
   imports = [
-    ./zfs-minimal.nix
+#    ./zfs-minimal.nix
     ./no-bootloaders.nix
     ./python-minimal.nix
     ./noveau-workaround.nix