diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index a7a9ab8f81a701628f0009b33cede57fa7ccde1a..12465392a6317b1126619a1989636101727cdc1f 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1775,7 +1775,8 @@ image_setup_utils() {
     chroot "$rootdir" $INSTALL_PACKAGES apt-transport-https
     # shellcheck disable=SC2086
     chroot "$rootdir" $REMOVE_PACKAGES_PURGE apache2-bin*
-    chroot "$rootdir" apt-get -yq dist-upgrade
+    # shellcheck disable=SC2086
+    chroot "$rootdir" $UPGRADE_PACKAGES
     # shellcheck disable=SC2086
     chroot "$rootdir" $INSTALL_PACKAGES ca-certificates
     # shellcheck disable=SC2086
diff --git a/src/freedombone-shortcuts b/src/freedombone-shortcuts
index 18bb87c73583a2819591d334983bc6b5f020f58e..626c546fe61399019b709b69ee2b2efe8bc846be 100755
--- a/src/freedombone-shortcuts
+++ b/src/freedombone-shortcuts
@@ -31,8 +31,10 @@ INSTALL_PACKAGES_BACKPORTS='apt-get -yq -t stretch-backports install'
 
 REMOVE_PACKAGES='apt-get -yq remove'
 REMOVE_PACKAGES_PURGE='apt-get -yq remove --purge'
+REMOVE_PURGE='apt-get -yq purge'
 
 UPDATE_PACKAGES='apt-get -yq update'
+UPGRADE_PACKAGES='apt-get -yq dist-upgrade'
 
 PACKAGE_HOLD='apt-mark -q hold'
 PACKAGE_UNHOLD='apt-mark -q unhold'
diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database
index 311ad480c4387099b7117eb39f15778d924832ef..1f0df97f32f0e43f322bbd748d04afa7cb138a1f 100755
--- a/src/freedombone-utils-database
+++ b/src/freedombone-utils-database
@@ -390,7 +390,7 @@ quit" > "$INSTALL_DIR/batch.sql"
 
 
 function database_reinstall {
-    apt-get -yq purge mariadb*
+    $REMOVE_PURGE mariadb*
     rm -rf /var/lib/mysql
     rm -rf /etc/mysql
     sed -i '/mariadb/d' "${HOME}/${PROJECT_NAME}-completed.txt"
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 97936a65efd33ae7a1ed5fc89d437504214641a4..6e154c6650791abc20736c93d062f40c3905069e 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -278,7 +278,7 @@ function initial_setup {
     fi
 
     $REMOVE_PACKAGES_PURGE apache2-bin*
-    apt-get -yq dist-upgrade
+    $UPGRADE_PACKAGES
     $INSTALL_PACKAGES ca-certificates
     $INSTALL_PACKAGES apt-utils
     $INSTALL_PACKAGES cryptsetup libgfshare-bin duplicity sshpass wget avahi-daemon