diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml
index 09ccfdcea50ccde4a4460b496c7a170cb9cf37e2..9ae252189b1f4d29060d0bcd917808106b99d0b8 100644
--- a/.oniro-ci/machines-and-flavours.yaml
+++ b/.oniro-ci/machines-and-flavours.yaml
@@ -243,15 +243,6 @@ zephyr-qemu-cortex-m3-twister-gcc:
 zephyr-qemu-cortex-m3-twister-clang:
   extends: [.zephyr-qemu-cortex-m3-twister, .toolchain-clang, .broken]
 
-.zephyr-96b-avenger:
-  extends: .build-zephyr-image
-  variables:
-    MACHINE: 96b-avenger96
-zephyr-96b-avenger-gcc:
-  extends: [.zephyr-96b-avenger, .toolchain-gcc]
-zephyr-96b-avenger-clang:
-  extends: [.zephyr-96b-avenger, .toolchain-clang, .broken]
-
 .zephyr-nrf52840dk-nrf52840:
   extends: .build-zephyr-image
   variables:
diff --git a/docs/build-flavours/zephyr-flavour.rst b/docs/build-flavours/zephyr-flavour.rst
index c3025e4da802e52e2939c2007dc40f4bca94435b..50c17d91b9d4c3fbfc6a8504f154ac6c9e9895fa 100644
--- a/docs/build-flavours/zephyr-flavour.rst
+++ b/docs/build-flavours/zephyr-flavour.rst
@@ -22,7 +22,6 @@ Supported machines (default in **bold**):
 
 * **qemu-x86**
 * qemu-cortex-m3
-* 96b-avenger96 (96Boards Avenger96)
 * arduino-nano-33-ble (Arduino Nano 33 BLE and Arduino Nano 33 BLE Sense)
 
 Build steps example:
diff --git a/docs/ci/machines-and-flavours.rst b/docs/ci/machines-and-flavours.rst
index 831545ed3cc30fec82c5d5e16f0341858dc16501..cf97d2a2049cb925fb48098230d9ebee373305ef 100644
--- a/docs/ci/machines-and-flavours.rst
+++ b/docs/ci/machines-and-flavours.rst
@@ -113,19 +113,6 @@ basic 32bit ARM micro-controller virtual machine.
 
 The cache for this job is publicly available.
 
-zephyr-96b-avenger
-..................
-
-This job extends `.build-zephyr` job from the manifest repository and builds
-``zephyr-philosophers`` using the Zephyr flavour of |main_project_name| and
-``MACHINE=96b-avenger96``. This job checks that Zephyr can be built for the
-96Boards Avenger development board cortex-M3 core, embedded into STM32MP157
-SoC.
-
-.. note::
-    The cache for this job is not public, pending legal review of any firmware
-    that may be included.
-
 zephyr-arduino-nano-33-ble
 ..........................
 
diff --git a/flavours/zephyr/conf-notes.txt b/flavours/zephyr/conf-notes.txt
index 30a771903419d6888d8a4a58e4de285d0c2d351f..1153f17210eabd0188c7239b3898937aad1fa0f4 100644
--- a/flavours/zephyr/conf-notes.txt
+++ b/flavours/zephyr/conf-notes.txt
@@ -6,7 +6,6 @@ You can now run 'bitbake zephyr-philosophers'
 Supported machines (first is the default):
 - qemu-x86
 - qemu-cortex-m3
-- 96b-avenger96 (96Boards Avenger96)
 - arduino-nano-33-ble (Arduino Nano 33 BLE and Arduino Nano 33 BLE Sense)
 
 MACHINE variable can be set up in conf/local.conf file under build directory
diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample
index ff7af319c0f6baf20cf9736f4346dda5eb8d4412..5af885a2161f461f221054b65b01cbffda688fc4 100644
--- a/flavours/zephyr/local.conf.sample
+++ b/flavours/zephyr/local.conf.sample
@@ -26,8 +26,6 @@
 # There are also the following hardware board target machines included for
 # demonstration purposes:
 #
-#MACHINE ?= "96b-nitrogen"
-#MACHINE ?= "96b-avenger96"
 #MACHINE ?= "nrf52840dk-nrf52840"
 #MACHINE ?= "arduino-nano-33-ble"
 #