diff --git a/bootstrap.d/10-bootstrap.sh b/bootstrap.d/10-bootstrap.sh
index ec01b72..abc578c 100644
--- a/bootstrap.d/10-bootstrap.sh
+++ b/bootstrap.d/10-bootstrap.sh
@@ -20,12 +20,7 @@ if [ "$ENABLE_MINBASE" = true ] ; then
 fi
 
 # Exclude packages if required by Debian release
-if [ "$RELEASE" = "stretch" ] ; then
-  EXCLUDES="--exclude=init,systemd-sysv"
-fi
-
-# Exclude packages if required by Debian buster release
-if [ "$RELEASE" = "buster" ] ; then
+if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
   EXCLUDES="--exclude=init,systemd-sysv"
 fi
   
diff --git a/bootstrap.d/42-fbturbo.sh b/bootstrap.d/42-fbturbo.sh
index a2d5717..fba46b3 100644
--- a/bootstrap.d/42-fbturbo.sh
+++ b/bootstrap.d/42-fbturbo.sh
@@ -28,12 +28,7 @@ if [ "$ENABLE_FBTURBO" = true ] ; then
   fi
 
   # Install Xorg build dependencies
-  if [ "$RELEASE" = "jessie" ] ; then
-    chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-  elif [ "$RELEASE" = "stretch" ] ; then
-    chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-  # removed --allow-unauthenticated as recommended after amendment on _apt privileges
-  elif [ "$RELEASE" = "buster" ] ; then
+  if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
     chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
   fi
 
diff --git a/functions.sh b/functions.sh
index 52f9c35..f311816 100644
--- a/functions.sh
+++ b/functions.sh
@@ -59,10 +59,8 @@ chroot_install_cc() {
   if [ -z "${COMPILER_PACKAGES}" ] ; then
     COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
 
-    if [ "$RELEASE" = "jessie" ] ; then
+    if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
       chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
-    elif [ "$RELEASE" = "stretch" ] ; then
-      chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
     fi
   fi
 }