diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54d0eb3c6..42a96303e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -84,7 +84,10 @@ jobs:
           rock-pi-e,
           apalis-imx8, 
           apalis-imx8-boot2qt,
-          x86-virtual
+          x86-virtual,
+          jetson-orin-nano-devkit,
+          jetson-orin-nano-devkit-nvme,
+          jetson-agx-orin-devkit,
         ]
         experimental: [false]
         subpath: [.]
diff --git a/kas/jetson-orin-nano-devkit-nvme.yml b/kas/jetson-orin-nano-devkit-nvme.yml
new file mode 100644
index 000000000..28323bc97
--- /dev/null
+++ b/kas/jetson-orin-nano-devkit-nvme.yml
@@ -0,0 +1,16 @@
+header:
+  version: 11
+  includes:
+    - kas/jetson-orin-nano-devkit.yml
+
+machine: jetson-orin-nano-devkit-nvme
+
+local_conf_header:
+  nvme: |
+    TEGRAFLASH_NO_INTERNAL_STORAGE = "0"
+    PARTITION_LAYOUT_TEMPLATE_DEFAULT = "flash_t234_qspi.xml"
+    PARTITION_LAYOUT_EXTERNAL="flash_l4t_t234_nvme.xml"
+    # Mender tegra_mender_calc_total_size workaround
+    # Setting MENDER_STORAGE_TOTAL_SIZE_MB to 16Gb and no EMMC
+    EMMC_SIZE = "0"
+    MENDER_STORAGE_TOTAL_SIZE_MB = "16384"