diff --git a/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
index 645d1da..a183a78 100644
--- a/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
+++ b/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
@@ -14,7 +14,7 @@
 inherit python3-dir
 
 # Used for setup.py on PYNQ
-BOARD_NAME_ultra96-zynqmp = "Ultra96"
+BOARD_NAME_ultra96 = "Ultra96"
 BOARD_NAME_zcu104-zynqmp = "ZCU104"
 
 do_compile_prepend() {
diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
index 6a69ea2..c20ac5d 100644
--- a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
+++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
@@ -22,7 +22,7 @@
 "
 
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp"
+COMPATIBLE_MACHINE_ultra96 = "${MACHINE}"
 
 S = "${WORKDIR}/git"
 
@@ -55,3 +55,4 @@
     cp -r ${S}/notebooks/* ${JUPYTER_NOTEBOOKS}/bnn_examples/
 }
 
+PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}"
diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
index 1cddb60..d1aabb7 100644
--- a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
+++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
@@ -15,7 +15,7 @@
 "
 
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp"
+COMPATIBLE_MACHINE_ultra96 = "${MACHINE}"
 
 SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596"
 SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460"
@@ -37,3 +37,4 @@
 
 }
 
+PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}"