diff --git a/kas/demos/qemuarm64-client-only.yml b/kas/demos/qemuarm64-client-only.yml
index 188bfd87..4ed4fd79 100644
--- a/kas/demos/qemuarm64-client-only.yml
+++ b/kas/demos/qemuarm64-client-only.yml
@@ -1,5 +1,5 @@
 header:
-  version: 11
+  version: 14
   includes:
   - kas/include/mender-base.yml
 
diff --git a/kas/demos/raspberrypi4-64-app-updates.yml b/kas/demos/raspberrypi4-64-app-updates.yml
index bb68cff4..0b7273ff 100644
--- a/kas/demos/raspberrypi4-64-app-updates.yml
+++ b/kas/demos/raspberrypi4-64-app-updates.yml
@@ -1,5 +1,5 @@
 header:
-  version: 11
+  version: 14
   includes:
   - kas/raspberrypi4-64.yml
 
diff --git a/kas/include/mender-base.yml b/kas/include/mender-base.yml
index 8861ae8b..eab6eb92 100644
--- a/kas/include/mender-base.yml
+++ b/kas/include/mender-base.yml
@@ -20,7 +20,7 @@ repos:
 
   meta-mender:
     url: https://github.com/mendersoftware/meta-mender.git
-    commit: 61b6f2298bad965cf6be41ebf11e62e4c314512f
+    commit: 2f70dbad1441055c299332b7ef33dfe1e4f50c1c
     layers:
       meta-mender-core:
 
diff --git a/kas/include/tegra-base.yml b/kas/include/tegra-base.yml
index 4496bc61..d85dec45 100644
--- a/kas/include/tegra-base.yml
+++ b/kas/include/tegra-base.yml
@@ -30,7 +30,7 @@ local_conf_header:
     # these two classes only work as intended when being inherited in the
     # OE4t setup-env.sh style environment, as they modify bblayers.conf
     # and expect additional information on the host.
-    INHERIT:remove = "tegra-support-sanity distro_layer_buildinfo"
+    INHERIT:remove = "tegra-support-sanity distro_layer_buildinfo" 
     INHERIT += "tegra-mender-setup"
     MENDER_FEATURES_ENABLE:append = " mender-growfs-data"
     MENDER_FEATURES_DISABLE:append = " mender-uboot"
diff --git a/kas/include/tegra-jetpack6.yml b/kas/include/tegra-jetpack6.yml
index 81a0cada..5ce1a7b9 100644
--- a/kas/include/tegra-jetpack6.yml
+++ b/kas/include/tegra-jetpack6.yml
@@ -6,13 +6,13 @@ header:
 repos:
   meta-tegra:
     # refers to the scarthgap branch
-    commit: b20cff753ff0ffc24121cb35d2e2d218c2d26cf3
+    commit: 20f761d3e072441ba1ee252e0b30d821395c4d7c
   meta-tegra-community:
     # refers to the scarthgap branch
-    commit: 68f0520b73312ecc6767252de569679c374afc73
+    commit: 1ec483599ebd16967468e71012f653ad2fa045cc
   meta-tegrademo:
     # refers to the scarthgap branch
-    commit: 7d54c8f932b9527255e9b871b662beaafca7fa7b
+    commit: 1457cc45939f72aef097cb5799a7fd9120bab332
 
   meta-mender-community:
     layers:
diff --git a/kas/jetson-agx-orin-devkit-64.yml b/kas/jetson-agx-orin-devkit-64.yml
new file mode 100644
index 00000000..23342681
--- /dev/null
+++ b/kas/jetson-agx-orin-devkit-64.yml
@@ -0,0 +1,11 @@
+header:
+  version: 14
+  includes:
+  - kas/include/mender-full.yml
+  - kas/include/tegra-jetpack6.yml
+
+machine: p3737-0000-p3701-0005
+
+local_conf_header:
+  AB-upgrades: |
+    USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1"
diff --git a/meta-mender-tegra/recipes-bsp/uefi/edk2-firmware-tegra_%.bbappend b/meta-mender-tegra/recipes-bsp/uefi/l4t-launcher-rootfs-ab-config_%.bbappend
similarity index 100%
rename from meta-mender-tegra/recipes-bsp/uefi/edk2-firmware-tegra_%.bbappend
rename to meta-mender-tegra/recipes-bsp/uefi/l4t-launcher-rootfs-ab-config_%.bbappend
diff --git a/meta-mender-tegra/recipes-kernel/linux/linux-tegra_%.bbappend b/meta-mender-tegra/recipes-kernel/linux/linux-jammy-nvidia-tegra_5.15%.bbappend
similarity index 100%
rename from meta-mender-tegra/recipes-kernel/linux/linux-tegra_%.bbappend
rename to meta-mender-tegra/recipes-kernel/linux/linux-jammy-nvidia-tegra_5.15%.bbappend
diff --git a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate
index 02513be2..b29e6541 100644
--- a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate
+++ b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate
@@ -4,4 +4,4 @@ CAPTARGET="/boot/efi/EFI/UpdateCapsule/TEGRA_BL.Cap"
 
 if [ -f "$CAPTARGET" ]; then
     rm "$CAPTARGET"
-fi
\ No newline at end of file
+fi