diff --git a/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk b/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk
index d8b24720dd..e48c0511a9 100644
--- a/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.6.3"
 PKG_SHA256="eb446070be1444fd7d32d32bbca53c2f3bbb0a21193db86198cf6050b7a28441"
 PKG_LICENSE="GPLv2+"
 PKG_SITE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"
-PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-$PKG_VERSION.tar.gz"
+PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Tools for interacting with the linux GPIO character device."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/service/prometheus-node-exporter/package.mk b/packages/addons/service/prometheus-node-exporter/package.mk
index a4e21e2798..9c80ab2e69 100644
--- a/packages/addons/service/prometheus-node-exporter/package.mk
+++ b/packages/addons/service/prometheus-node-exporter/package.mk
@@ -30,7 +30,7 @@ configure_target() {
 }
 
 make_target() {
-  ${GOLANG} build -a -ldflags "${LDFLAGS}" -o bin/prometheus-node-exporter -v 
+  ${GOLANG} build -a -ldflags "${LDFLAGS}" -o bin/prometheus-node-exporter -v
 }
 
 addon() {
diff --git a/packages/audio/espeak-ng/package.mk b/packages/audio/espeak-ng/package.mk
index c3d26b93bc..8b312c97d5 100644
--- a/packages/audio/espeak-ng/package.mk
+++ b/packages/audio/espeak-ng/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.50"
 PKG_SHA256="80ee6cd06fcd61888951ab49362b400e80dd1fac352a8b1131d90cfe8a210edb"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/espeak-ng/espeak-ng"
-PKG_URL="https://github.com/espeak-ng/espeak-ng/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="https://github.com/espeak-ng/espeak-ng/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tgz"
 PKG_DEPENDS_HOST="gcc:host "
 PKG_DEPENDS_TARGET="toolchain espeak-ng:host"
 PKG_LONGDESC="eSpeak NG is an open source speech synthesizer that supports more than a hundred languages and accents"
@@ -28,8 +28,8 @@ make_target() {
 
 makeinstall_target() {
   make src/espeak-ng src/speak-ng
-  make install-exec DESTDIR=$INSTALL
-  mkdir -p $INSTALL/usr/share/espeak-ng-data
-  cp -prf $TOOLCHAIN/share/espeak-ng-data $INSTALL/usr/share
+  make install-exec DESTDIR=${INSTALL}
+  mkdir -p ${INSTALL}/usr/share/espeak-ng-data
+  cp -prf ${TOOLCHAIN}/share/espeak-ng-data ${INSTALL}/usr/share
 }
 
diff --git a/packages/graphics/nvidia/package.mk b/packages/graphics/nvidia/package.mk
index 19b44ffc1e..168b1f0f50 100644
--- a/packages/graphics/nvidia/package.mk
+++ b/packages/graphics/nvidia/package.mk
@@ -88,7 +88,7 @@ makeinstall_target() {
   # Vulkan
   if [ "${VULKAN_SUPPORT}" = "yes" ]; then
     mkdir -p ${INSTALL}/usr/lib
-      cp -P libnvidia-glvkspirv.so.${PKG_VERSION}  ${INSTALL}/usr/lib 
+      cp -P libnvidia-glvkspirv.so.${PKG_VERSION}  ${INSTALL}/usr/lib
       ln -sf libnvidia-glvkspirv.so.${PKG_VERSION} ${INSTALL}/usr/lib/libnvidia-glvkspirv.so
 
       cp -p libnvidia-vulkan-producer.so.${PKG_VERSION}  ${INSTALL}/usr/lib
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 13323819e8..add3eeb9fa 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -62,7 +62,7 @@ configure_package() {
     KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=OFF"
   fi
 
-  if [ "$ESPEAK_SUPPORT" = yes ]; then
+  if [ "${ESPEAK_SUPPORT}" = yes ]; then
     PKG_DEPENDS_TARGET+=" espeak-ng"
   fi
 
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index 73bbe5b0b2..665e0de845 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -9,7 +9,7 @@ PKG_DEPENDS_TARGET="toolchain zlib bzip2 gnutls speex"
 PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
 PKG_BUILD_FLAGS="-gold"
 
-case "$PROJECT" in
+case "${PROJECT}" in
   Amlogic)
     PKG_VERSION="6144fe76840e1d8dfd549ba9c72e2cce01db9638" # dev/4.4/rpi_import_1
     PKG_SHA256="b014a7ad4a592163c5af47e105e967a26856824b8f603e3e39c80af50975f1e7"
diff --git a/packages/multimedia/gstreamer/gstreamer/package.mk b/packages/multimedia/gstreamer/gstreamer/package.mk
index 4818fccbf8..1603bc9e6f 100644
--- a/packages/multimedia/gstreamer/gstreamer/package.mk
+++ b/packages/multimedia/gstreamer/gstreamer/package.mk
@@ -38,7 +38,7 @@ pre_configure_target() {
                          -Dpackage-origin="LibreELEC.tv"
                          -Ddoc=disabled"
 }
-  
+
 post_makeinstall_target() {
   # clean up
   safe_remove ${INSTALL}/usr/share
diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk
index e3913bf940..7abb080a72 100644
--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@@ -79,7 +79,7 @@ makeinstall_target() {
   # Install Vulkan ICD & SPIR-V lib
   if [ "${VULKAN_SUPPORT}" = "yes" ]; then
     mkdir -p ${INSTALL}/usr/lib
-      cp -P libnvidia-glvkspirv.so.${PKG_VERSION} ${INSTALL}/usr/lib 
+      cp -P libnvidia-glvkspirv.so.${PKG_VERSION} ${INSTALL}/usr/lib
     mkdir -p ${INSTALL}/usr/share/vulkan/icd.d
       cp -P nvidia_icd.json ${INSTALL}/usr/share/vulkan/icd.d
     mkdir -p ${INSTALL}/usr/share/vulkan/implicit_layer.d