diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
index ec4e0344..b49548a6 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
@@ -12,8 +12,7 @@ DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3.bin"
 
 DEPLOY_IMAGES_NAME:k3 = "bl31.bin bl32.bin"
 DEPLOY_IMAGES_NAME:append:am65xx = " sysfw.itb"
-DEPLOY_IMAGES_NAME:append:j721e-evm = " sysfw.itb"
-DEPLOY_IMAGES_NAME:append:j721e-hs-evm = " sysfw.itb"
+DEPLOY_IMAGES_NAME:append:j721e = " sysfw.itb"
 DEPLOY_IMAGES_NAME:append:am65xx-evm = " sysfw-am65x-evm.itb sysfw-am65x_sr2-evm.itb"
 
 ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
index 3c31ba18..296eef7a 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
@@ -24,7 +24,9 @@ DTB_FILTER:am57xx-hs-evm = "${DTB_FILTER:am57xx-evm}"
 DTB_FILTER:ti43x = "am43"
 DTB_FILTER:omapl138 = "da850"
 DTB_FILTER:am65xx = "am65"
-DTB_FILTER:j7 = "j721e"
+DTB_FILTER:j721e = "j721e"
+DTB_FILTER:j7200 = "j7200"
+DTB_FILTER:j721s2 = "j721s2"
 
 # List of target side images to build for the SDK
 TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisdk-bootstrap-image"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index 9efc2cae..57118775 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -31,11 +31,7 @@ UTILS:append:k3 = " \
     trusted-firmware-a-source \
 "
 
-UTILS:append:j721e-evm = " \
-    pru-icss-source \
-"
-
-UTILS:append:j721e-hs-evm = " \
+UTILS:append:j721e = " \
     pru-icss-source \
 "
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index f4e72a89..c01e9497 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -61,9 +61,9 @@ UTILS:append:am64xx = " ti-rtos-firmware pru-icss"
 UTILS:append:am62xx = " ti-rtos-firmware"
 #UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
 UTILS:append:am65xx = " ti-rtos-firmware pru-icss"
-UTILS:append:j7 = " ti-rtos-firmware"
-UTILS:append:j721e-evm = " pru-icss"
-UTILS:append:j721e-hs-evm = " pru-icss"
+UTILS:append:j721e = " ti-rtos-firmware pru-icss"
+UTILS:append:j7200 = " ti-rtos-firmware"
+UTILS:append:j721s2 = " ti-rtos-firmware"
 
 UTILS:append:omapl138 = " ti-ipc-rtos-fw"
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
index e16e4d51..e6e0b915 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
@@ -19,7 +19,9 @@ ANALYTICS = ""
 #    ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \
 #    ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 #"
-ANALYTICS:j7 = ""
+ANALYTICS:j721e = ""
+ANALYTICS:j7200 = ""
+ANALYTICS:j721s2 = ""
 ANALYTICS:omapl138 = ""
 
 RDEPENDS:${PN} = "\
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index 99a6cc82..5f56f8be 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -78,7 +78,15 @@ ARAGO_TI_TEST:append:k3 = " \
     k3conf \
 "
 
-ARAGO_TI_TEST:append:j7 = " \
+ARAGO_TI_TEST:append:j721e = " \
+    ufs-utils \
+"
+
+ARAGO_TI_TEST:append:j7200 = " \
+    ufs-utils \
+"
+
+ARAGO_TI_TEST:append:j721s2 = " \
     ufs-utils \
 "
 
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
index cee03bc2..09918cbc 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
@@ -7,10 +7,8 @@ PLATFORM_TYPE = $(PLATFORM_TYPE_$(PLATFORM))
 SYSFW_CONFIG = evm
 
 SYSFW_SOC_$(PLATFORM) = NULL
-SYSFW_SOC_am65xx-evm = am65x
-SYSFW_SOC_am65xx-hs-evm = am65x
-SYSFW_SOC_j721e-evm = j721e
-SYSFW_SOC_j721e-hs-evm = j721e
+SYSFW_SOC_am65xx = am65x
+SYSFW_SOC_j721e = j721e
 SYSFW_SOC = $(SYSFW_SOC_$(PLATFORM))
 
 SYSFW_PREFIX = ti-sci-firmware
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
index de9f1c7d..5cc57460 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
@@ -28,11 +28,7 @@ SRC_URI:append:am65xx = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI:append:j721e-evm = " \
-    ${GSTDRM_WAYLANDSINK_PATCHES} \
-"
-
-SRC_URI:append:j721e-hs-evm = " \
+SRC_URI:append:j721e = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "