diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend
index 655c1266..ebd11b49 100644
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,3 +1,3 @@
 PACKAGECONFIG_append_tegra = " egl glesv2"
 PACKAGECONFIG_remove_tegra = "opengl"
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend
index 68be65dc..37434d7f 100644
--- a/recipes-graphics/cogl/cogl-1.0_%.bbappend
+++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend
@@ -1 +1,2 @@
-EDEPENDS_X11 += "libxdamage"
+EDEPENDS_X11_append_tegra = " libxdamage"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend
index a71143d7..a610ddff 100644
--- a/recipes-graphics/drm/libdrm_%.bbappend
+++ b/recipes-graphics/drm/libdrm_%.bbappend
@@ -6,4 +6,4 @@ LDFLAGS_append_tegra = " -Wl,-Bsymbolic-functions"
 pkg_postinst_${PN}_tegra() {
     ln -sf libdrm_nvdc.so $D${libdir}/libdrm.so.2
 }
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
diff --git a/recipes-graphics/libglvnd/libglvnd_1.3.1.bb b/recipes-graphics/libglvnd/libglvnd_1.3.1.bb
index 980b4b8e..2e7948ae 100644
--- a/recipes-graphics/libglvnd/libglvnd_1.3.1.bb
+++ b/recipes-graphics/libglvnd/libglvnd_1.3.1.bb
@@ -21,7 +21,7 @@ inherit autotools pkgconfig features_check python3native
 
 S = "${WORKDIR}/git"
 
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 3d7e86d5..b27b0bf8 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -1,2 +1,2 @@
 PACKAGECONFIG_tegra = "egl gles2 x11 glx"
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
diff --git a/recipes-graphics/vulkan/vulkan-demos_%.bbappend b/recipes-graphics/vulkan/vulkan-demos_%.bbappend
index 3f606335..98a315f9 100644
--- a/recipes-graphics/vulkan/vulkan-demos_%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-demos_%.bbappend
@@ -3,4 +3,4 @@ ANY_OF_DISTRO_FEATURES_tegra = ""
 REQUIRED_DISTRO_FEATURES_append_tegra = " x11"
 PACKAGECONFIG_tegra = "xcb"
 
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend
index cd8e89f3..7b8084d5 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend
@@ -1,5 +1,5 @@
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
 PACKAGECONFIG_remove_tegra = "wayland"
 RRECOMMENDS_${PN}_remove_tegra = "mesa-vulkan-drivers"
 RDEPENDS_${PN}_tegra = "tegra-libraries libxcb libxcb-glx0"
-INSANE_SKIP_${PN} += "build-deps"
+INSANE_SKIP_${PN}_append_tegra = " build-deps"
diff --git a/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend b/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend
index fd0eee41..f86c9d21 100644
--- a/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend
@@ -1,2 +1,2 @@
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
 PACKAGECONFIG_remove_tegra = "wayland"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
index 887f0af3..0f3b2858 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
@@ -2,4 +2,4 @@ OPENGL_PKGCONFIGS_remove_tegra = "glamor"
 PACKAGECONFIG_remove_tegra = "dri2"
 PACKAGECONFIG_append_tegra = " xinerama"
 
-PACKAGE_ARCH_tegra = "${SOC_FAMILY_PKGARCH}"
+PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"