diff --git a/packages/addons/addon-depends/rpi-tools-depends/colorzero/package.mk b/packages/addons/addon-depends/rpi-tools-depends/colorzero/package.mk
deleted file mode 100644
index e3868d6f99..0000000000
--- a/packages/addons/addon-depends/rpi-tools-depends/colorzero/package.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="colorzero"
-PKG_VERSION="1.1"
-PKG_SHA256="24d30b55793150f9ae7478f8aa2126fe5598a31f928907eadbf9d5a19aa9964c"
-PKG_ARCH="arm"
-PKG_LICENSE="BSD"
-PKG_SITE="https://github.com/waveform80/colorzero"
-PKG_URL="https://github.com/waveform80/colorzero/archive/release-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="Another color manipulation library for Python (originally from picamera)."
-PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk b/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk
deleted file mode 100644
index 8a40c662ce..0000000000
--- a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="picamera"
-PKG_VERSION="1.13"
-PKG_SHA256="890815aa01e4d855a6a95dd3ad0953b872a6b954982106407df0c5a31a163e50"
-PKG_ARCH="arm"
-PKG_LICENSE="BSD"
-PKG_SITE="https://github.com/waveform80/picamera"
-PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host bcm2835-driver"
-PKG_LONGDESC="A python and shell interface for the Raspberry Pi camera module."
-PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/libraries/adafruit-libraries/package.mk b/packages/addons/libraries/adafruit-libraries/package.mk
index 22ce8768e5..7b74cc9cda 100644
--- a/packages/addons/libraries/adafruit-libraries/package.mk
+++ b/packages/addons/libraries/adafruit-libraries/package.mk
@@ -5,7 +5,7 @@ PKG_NAME="adafruit-libraries"
 PKG_VERSION=""
 PKG_REV="107"
 PKG_ARCH="any"
-PKG_ADDON_PROJECTS="RPi"
+PKG_ADDON_PROJECTS="RPi ARM"
 PKG_LICENSE="MIT"
 PKG_SITE=""
 PKG_URL=""
diff --git a/packages/addons/service/dispmanx_vnc/package.mk b/packages/addons/service/dispmanx_vnc/package.mk
index c549208d8e..99d3349663 100644
--- a/packages/addons/service/dispmanx_vnc/package.mk
+++ b/packages/addons/service/dispmanx_vnc/package.mk
@@ -5,7 +5,7 @@ PKG_NAME="dispmanx_vnc"
 PKG_VERSION="1.0"
 PKG_REV="100"
 PKG_ARCH="arm"
-PKG_ADDON_PROJECTS="RPi"
+PKG_ADDON_PROJECTS="RPi ARM"
 PKG_LICENSE="OSS"
 PKG_SITE=""
 PKG_URL=""
diff --git a/packages/addons/service/touchscreen/package.mk b/packages/addons/service/touchscreen/package.mk
index 9e2b318071..8f9f8bcca8 100644
--- a/packages/addons/service/touchscreen/package.mk
+++ b/packages/addons/service/touchscreen/package.mk
@@ -5,7 +5,7 @@ PKG_NAME="touchscreen"
 PKG_VERSION="1.0"
 PKG_REV="103"
 PKG_ARCH="any"
-PKG_ADDON_PROJECTS="Generic RPi"
+PKG_ADDON_PROJECTS="Generic RPi ARM"
 PKG_LICENSE="GPL"
 PKG_SITE=""
 PKG_URL=""
diff --git a/packages/addons/tools/rpi-tools/changelog.txt b/packages/addons/tools/rpi-tools/changelog.txt
index 15de6d6d61..9b3c8fe1de 100644
--- a/packages/addons/tools/rpi-tools/changelog.txt
+++ b/packages/addons/tools/rpi-tools/changelog.txt
@@ -1,3 +1,6 @@
+108
+- Remove legacy camera tools
+
 107
 - Update RPi.GPIO to 0.7.0
 
diff --git a/packages/addons/tools/rpi-tools/package.mk b/packages/addons/tools/rpi-tools/package.mk
index fb5b99c627..e07e882cc7 100644
--- a/packages/addons/tools/rpi-tools/package.mk
+++ b/packages/addons/tools/rpi-tools/package.mk
@@ -3,37 +3,28 @@
 
 PKG_NAME="rpi-tools"
 PKG_VERSION="1.0"
-PKG_REV="107"
+PKG_REV="108"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain RPi.GPIO picamera gpiozero colorzero lan951x-led-ctl"
+PKG_DEPENDS_TARGET="toolchain RPi.GPIO gpiozero lan951x-led-ctl"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of tools and programs for use on the Raspberry Pi"
-PKG_LONGDESC="This bundle currently includes RPi.GPIO, picamera, gpiozero lan951x-led-ctl"
+PKG_LONGDESC="This bundle currently includes RPi.GPIO, gpiozero and lan951x-led-ctl"
 PKG_DISCAIMER="Raspberry Pi is a trademark of the Raspberry Pi Foundation http://www.raspberrypi.org"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Raspberry Pi Tools"
 PKG_ADDON_TYPE="xbmc.python.module"
-PKG_ADDON_PROJECTS="RPi"
+PKG_ADDON_PROJECTS="RPi ARM"
 
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi/
     cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi
-    cp -PR $(get_build_dir picamera)/picamera $ADDON_BUILD/$PKG_ADDON_ID/lib/
     cp -PR $(get_build_dir gpiozero)/gpiozero $ADDON_BUILD/$PKG_ADDON_ID/lib/
-    cp -PR $(get_build_dir colorzero)/colorzero $ADDON_BUILD/$PKG_ADDON_ID/lib/
 
-  BCM2835_DIR="$(get_build_dir bcm2835-driver)"
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspistill $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspiyuv $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspivid $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspividyuv $ADDON_BUILD/$PKG_ADDON_ID/bin
-
-  # lan951x-led-ctl
     cp -P $(get_build_dir lan951x-led-ctl)/lan951x-led-ctl $ADDON_BUILD/$PKG_ADDON_ID/bin
 }