diff --git a/ci.nix b/ci.nix
index ce2557f..a4d051c 100644
--- a/ci.nix
+++ b/ci.nix
@@ -8,17 +8,21 @@ let
   pkgs = (import nixpkgs {});
   borderVmConf =  ./bordervm.conf-example.nix;
   inherit (pkgs.lib.attrsets) genAttrs;
-  devices = [ "qemu" "gl-ar750" "gl-mt300n-v2" "gl-mt300a" ];
+  devices = {
+    virt = [ "qemu" ];
+    hw = [ "gl-ar750" "gl-mt300n-v2" "gl-mt300a"  ];
+  };
   vanilla = ./vanilla-configuration.nix;
-  for-device = name:
+  for-device = cfg: name:
     (import liminix {
       inherit nixpkgs borderVmConf;
       device = import (liminix + "/devices/${name}");
-      liminix-config = vanilla;
+      liminix-config = cfg;
     }).outputs.default;
   tests = import ./tests/ci.nix;
   jobs =
-    (genAttrs devices (name: for-device name)) //
+    (genAttrs devices.hw (name: for-device ./vanilla-configuration-hw.nix name)) //
+    (genAttrs devices.virt (name: for-device vanilla name)) //
     tests //
     {
       buildEnv = (import liminix {
diff --git a/vanilla-configuration-hw.nix b/vanilla-configuration-hw.nix
new file mode 100644
index 0000000..45c5e80
--- /dev/null
+++ b/vanilla-configuration-hw.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [
+    ./vanilla-configuration.nix
+    ./modules/standard.nix
+  ];
+}