diff --git a/packages/virtual/corefonts/package.mk b/packages/virtual/corefonts/package.mk
index c269c60b38..b6bf482f6d 100644
--- a/packages/virtual/corefonts/package.mk
+++ b/packages/virtual/corefonts/package.mk
@@ -10,8 +10,8 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_LONGDESC="corefonts is a Metapackage for installing fonts"
 
-if [ -n "$CUSTOM_FONTS" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $CUSTOM_FONTS"
+if [ -n "${CUSTOM_FONTS}" ]; then
+  PKG_DEPENDS_TARGET+=" ${CUSTOM_FONTS}"
 else
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET liberation-fonts-ttf"
+  PKG_DEPENDS_TARGET+=" liberation-fonts-ttf"
 fi
diff --git a/packages/virtual/debug/package.mk b/packages/virtual/debug/package.mk
index b12030eff6..bc1a2c5982 100644
--- a/packages/virtual/debug/package.mk
+++ b/packages/virtual/debug/package.mk
@@ -13,18 +13,18 @@ PKG_LONGDESC="debug is a Metapackage for installing debugging tools"
 # configure GPU drivers and dependencies:
   get_graphicdrivers
 
-if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET vdpauinfo"
+if [ "${VDPAU_SUPPORT}" = "yes" -a "${DISPLAYSERVER}" = "x11" ]; then
+  PKG_DEPENDS_TARGET+=" vdpauinfo"
 fi
 
-if [ "$VAAPI_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva-utils"
+if [ "${VAAPI_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" libva-utils"
 fi
 
-if build_with_debug && [ "$VALGRIND" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET valgrind"
+if build_with_debug && [ "${VALGRIND}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" valgrind"
 fi
 
-if [ "$REMOTE_GDB" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gdb:host"
+if [ "${REMOTE_GDB}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" gdb:host"
 fi
diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk
index 1b4b85568f..d2d3957730 100644
--- a/packages/virtual/image/package.mk
+++ b/packages/virtual/image/package.mk
@@ -9,33 +9,33 @@ PKG_SECTION="virtual"
 PKG_LONGDESC="Root package used to build and create complete image"
 
 # Graphic support
-[ ! "$DISPLAYSERVER" = "no" ] && PKG_DEPENDS_TARGET+=" $DISPLAYSERVER"
+[ ! "${DISPLAYSERVER}" = "no" ] && PKG_DEPENDS_TARGET+=" ${DISPLAYSERVER}"
 
 # Multimedia support
-[ ! "$MEDIACENTER" = "no" ] && PKG_DEPENDS_TARGET+=" mediacenter"
+[ ! "${MEDIACENTER}" = "no" ] && PKG_DEPENDS_TARGET+=" mediacenter"
 
 # Sound support
-[ "$ALSA_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa"
+[ "${ALSA_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa"
 
 # Automounter support
-[ "$UDEVIL" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil"
+[ "${UDEVIL}" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil"
 
 # NTFS 3G support
-[ "$NTFS3G" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs"
+[ "${NTFS3G}" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs"
 
 # Remote support
-[ "$REMOTE_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" remote"
+[ "${REMOTE_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" remote"
 
 # Virtual image creation support
-[ "$PROJECT" = "Generic" ] && PKG_DEPENDS_TARGET+=" virtual"
+[ "${PROJECT}" = "Generic" ] && PKG_DEPENDS_TARGET+=" virtual"
 
 # Installer support
-[ "$INSTALLER_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" installer"
+[ "${INSTALLER_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" installer"
 
 # Devtools... (not for Release)
-[ "$TESTING" = "yes" ] && PKG_DEPENDS_TARGET+=" testing"
+[ "${TESTING}" = "yes" ] && PKG_DEPENDS_TARGET+=" testing"
 
 # OEM packages
-[ "$OEM_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" oem"
+[ "${OEM_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" oem"
 
 true
diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk
index 65e5ce4bf5..7bd69ecd7a 100644
--- a/packages/virtual/initramfs/package.mk
+++ b/packages/virtual/initramfs/package.mk
@@ -12,14 +12,14 @@ PKG_DEPENDS_TARGET="toolchain initramfs:init"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Metapackage for installing initramfs"
 
-if [ "$ISCSI_SUPPORT" = yes ]; then
+if [ "${ISCSI_SUPPORT}" = yes ]; then
   PKG_DEPENDS_INIT+=" open-iscsi:init"
 fi
 
-if [ "$INITRAMFS_PARTED_SUPPORT" = yes ]; then
+if [ "${INITRAMFS_PARTED_SUPPORT}" = yes ]; then
   PKG_DEPENDS_INIT+=" parted:init"
 fi
 
-for i in $PKG_DEPENDS_INIT; do
-  PKG_NEED_UNPACK+=" $(get_pkg_directory $i)"
+for i in ${PKG_DEPENDS_INIT}; do
+  PKG_NEED_UNPACK+=" $(get_pkg_directory ${i})"
 done
diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk
index 01f646d185..4535bb3088 100644
--- a/packages/virtual/libc/package.mk
+++ b/packages/virtual/libc/package.mk
@@ -13,6 +13,6 @@ PKG_SECTION="virtual"
 PKG_LONGDESC="Meta package for installing various tools and libs needed for libc"
 
 if [ "${TARGET_ARCH}" = "arm" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem"
-  PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT arm-mem:init"
+  PKG_DEPENDS_TARGET+=" arm-mem"
+  PKG_DEPENDS_INIT+=" arm-mem:init"
 fi
diff --git a/packages/virtual/linux-drivers/package.mk b/packages/virtual/linux-drivers/package.mk
index 5933bc45ec..56eb39c3ba 100644
--- a/packages/virtual/linux-drivers/package.mk
+++ b/packages/virtual/linux-drivers/package.mk
@@ -6,10 +6,10 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain $ADDITIONAL_DRIVERS"
+PKG_DEPENDS_TARGET="toolchain ${ADDITIONAL_DRIVERS}"
 PKG_SECTION="virtual"
 PKG_LONGDESC="linux-drivers is a Meta package to install additional drivers"
 
-if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $DRIVER_ADDONS driverselect"
+if [ "${DRIVER_ADDONS_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" ${DRIVER_ADDONS} driverselect"
 fi
diff --git a/packages/virtual/linux-firmware/package.mk b/packages/virtual/linux-firmware/package.mk
index fa377ebba1..4d9a2382e7 100644
--- a/packages/virtual/linux-firmware/package.mk
+++ b/packages/virtual/linux-firmware/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE=""
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain $FIRMWARE"
+PKG_DEPENDS_TARGET="toolchain ${FIRMWARE}"
 PKG_SECTION="virtual"
 PKG_LONGDESC="linux-firmware is a meta-package to install various free firmware drivers"
diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk
index 1594871d43..32ffbf7038 100644
--- a/packages/virtual/mediacenter/package.mk
+++ b/packages/virtual/mediacenter/package.mk
@@ -7,40 +7,40 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain $MEDIACENTER"
+PKG_DEPENDS_TARGET="toolchain ${MEDIACENTER}"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Mediacenter: Metapackage"
 
-if [ "$MEDIACENTER" = "kodi" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $MEDIACENTER-theme-$SKIN_DEFAULT"
+if [ "${MEDIACENTER}" = "kodi" ]; then
+  PKG_DEPENDS_TARGET+=" ${MEDIACENTER}-theme-${SKIN_DEFAULT}"
 
-  for i in $SKINS; do
-    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $MEDIACENTER-theme-$i"
+  for i in ${SKINS}; do
+    PKG_DEPENDS_TARGET+=" ${MEDIACENTER}-theme-${i}"
   done
 
 # python-based tool for kodi management
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET texturecache.py"
+  PKG_DEPENDS_TARGET+=" texturecache.py"
 
 # some python stuff needed for various addons
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Pillow \
+  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} Pillow \
                                           simplejson \
                                           pycryptodome"
 
 # settings addon
-  if [ -n "$DISTRO_PKG_SETTINGS" ]; then
-    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $DISTRO_PKG_SETTINGS"
+  if [ -n "${DISTRO_PKG_SETTINGS}" ]; then
+    PKG_DEPENDS_TARGET+=" ${DISTRO_PKG_SETTINGS}"
   fi
 
 # other packages
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xmlstarlet"
+  PKG_DEPENDS_TARGET+=" xmlstarlet"
 
-  if [ "$JOYSTICK_SUPPORT" = "yes" ]; then
-    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET peripheral.joystick"
+  if [ "${JOYSTICK_SUPPORT}" = "yes" ]; then
+    PKG_DEPENDS_TARGET+=" peripheral.joystick"
   fi
 
   get_graphicdrivers
-  if listcontains "$GRAPHIC_DRIVERS" "(iris|i915|i965)"; then
-    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-vaapi-driver media-driver"
+  if listcontains "${GRAPHIC_DRIVERS}" "(iris|i915|i965)"; then
+    PKG_DEPENDS_TARGET+=" intel-vaapi-driver media-driver"
   fi
 
 fi
diff --git a/packages/virtual/misc-packages/package.mk b/packages/virtual/misc-packages/package.mk
index b1e9effe18..88afd339db 100644
--- a/packages/virtual/misc-packages/package.mk
+++ b/packages/virtual/misc-packages/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain $ADDITIONAL_PACKAGES"
+PKG_DEPENDS_TARGET="toolchain ${ADDITIONAL_PACKAGES}"
 PKG_SECTION="virtual"
 PKG_LONGDESC="misc-packages: Metapackage for miscellaneous packages"
diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk
index 293c1651fe..24c1d5c73f 100644
--- a/packages/virtual/network/package.mk
+++ b/packages/virtual/network/package.mk
@@ -10,23 +10,23 @@ PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw wireless-regdb"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Metapackage for various packages to install network support"
 
-if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bluez"
+if [ "${BLUETOOTH_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" bluez"
 fi
 
-if [ "$SAMBA_SERVER" = "yes" ] || [ "$SAMBA_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET samba"
+if [ "${SAMBA_SERVER}" = "yes" ] || [ "${SAMBA_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" samba"
 fi
 
-if [ "$OPENVPN_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn"
+if [ "${OPENVPN_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" openvpn"
 fi
 
-if [ "$WIREGUARD_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-tools"
+if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" wireguard-tools"
 fi
 
 # nss needed by inputstream.adaptive, chromium etc.
-if [ "$TARGET_ARCH" = "x86_64" ] || [ "$TARGET_ARCH" = "arm" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nss"
+if [ "${TARGET_ARCH}" = "x86_64" ] || [ "${TARGET_ARCH}" = "arm" ]; then
+  PKG_DEPENDS_TARGET+=" nss"
 fi
diff --git a/packages/virtual/virtual/package.mk b/packages/virtual/virtual/package.mk
index a6cfaef8d2..ae5e381d42 100644
--- a/packages/virtual/virtual/package.mk
+++ b/packages/virtual/virtual/package.mk
@@ -12,4 +12,4 @@ PKG_LONGDESC="virtual is a Meta package to install Virtual project extra depende
 
 get_graphicdrivers
 
-listcontains "$GRAPHIC_DRIVERS" "vmware" && PKG_DEPENDS_TARGET+=" open-vm-tools" || true
+listcontains "${GRAPHIC_DRIVERS}" "vmware" && PKG_DEPENDS_TARGET+=" open-vm-tools" || true
diff --git a/packages/virtual/x11/package.mk b/packages/virtual/x11/package.mk
index bd18d16abb..a6adada8f9 100644
--- a/packages/virtual/x11/package.mk
+++ b/packages/virtual/x11/package.mk
@@ -12,27 +12,27 @@ PKG_LONGDESC="X11 is the Windowing system"
 
 # Additional packages we need for using xorg-server:
 # Fonts
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"
+  PKG_DEPENDS_TARGET+=" encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"
 
 # Server
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xkeyboard-config xkbcomp"
+  PKG_DEPENDS_TARGET+=" xkeyboard-config xkbcomp"
 
 # Tools
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xrandr setxkbmap"
+  PKG_DEPENDS_TARGET+=" xrandr setxkbmap"
 
-if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $WINDOWMANAGER"
+if [ -n "${WINDOWMANAGER}" -a "${WINDOWMANAGER}" != "none" ]; then
+  PKG_DEPENDS_TARGET+=" ${WINDOWMANAGER}"
 fi
 
 get_graphicdrivers
 
 # Drivers
-if [ -n "$LIBINPUT" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-libinput"
+if [ -n "${LIBINPUT}" ]; then
+  PKG_DEPENDS_TARGET+=" xf86-input-libinput"
 else
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-evdev xf86-input-synaptics"
+  PKG_DEPENDS_TARGET+=" xf86-input-evdev xf86-input-synaptics"
 fi
 
-for drv in $XORG_DRIVERS; do
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-video-$drv"
+for drv in ${XORG_DRIVERS}; do
+  PKG_DEPENDS_TARGET+=" xf86-video-${drv}"
 done