diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 8e89d5aa..86e74730 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -229,6 +229,13 @@ is_command() {
     command -v "${check_command}" >/dev/null 2>&1
 }
 
+check_fresh_install() {
+    # in case of an update (can be a v5 -> v6 or v6 -> v6 update) or repair
+    if [[ -f "${PI_HOLE_V6_CONFIG}" ]] || [[ -f "/etc/pihole/setupVars.conf" ]]; then
+        fresh_install=false
+    fi
+}
+
 # Compatibility
 package_manager_detect() {
 
@@ -245,8 +252,6 @@ package_manager_detect() {
         PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
         # The command we will use to remove packages (used in the uninstaller)
         PKG_REMOVE="${PKG_MANAGER} -y remove --purge"
-        # Update package cache
-        update_package_cache || exit 1
 
     # If apt-get is not found, check for rpm.
     elif is_command rpm; then
@@ -2196,9 +2201,17 @@ main() {
     # Check for availability of either the "service" or "systemctl" commands
     check_service_command
 
+    # Check if this is a fresh install or an update/repair
+    check_fresh_install
+
     # Check for supported package managers so that we may install dependencies
     package_manager_detect
 
+    # Update package cache only on apt based systems
+    if is_command apt-get; then
+            update_package_cache || exit 1
+    fi
+
     # Notify user of package availability
     notify_package_updates_available
 
@@ -2219,10 +2232,7 @@ main() {
         exit 1
     fi
 
-    # in case of an update (can be a v5 -> v6 or v6 -> v6 update) or repair
-    if [[ -f "${PI_HOLE_V6_CONFIG}" ]] || [[ -f "/etc/pihole/setupVars.conf" ]]; then
-        # retain settings
-        fresh_install=false
+    if [[ "${fresh_install}" == false ]]; then
         # if it's running unattended,
         if [[ "${runUnattended}" == true ]]; then
             printf "  %b Performing unattended setup, no dialogs will be displayed\\n" "${INFO}"
diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py
index 0fa0453a..cf4b454d 100644
--- a/test/test_any_automated_install.py
+++ b/test/test_any_automated_install.py
@@ -89,10 +89,8 @@ def test_installPihole_fresh_install_readableFiles(host):
     export DEBIAN_FRONTEND=noninteractive
     umask 0027
     runUnattended=true
-    fresh_install=false
     source /opt/pihole/basic-install.sh > /dev/null
     runUnattended=true
-    fresh_install=false
     main
     /opt/pihole/pihole-FTL-prestart.sh
     """
@@ -473,6 +471,7 @@ def test_package_manager_has_pihole_deps(host):
         """
     source /opt/pihole/basic-install.sh
     package_manager_detect
+    update_package_cache
     build_dependency_package
     install_dependent_packages
     """
@@ -489,6 +488,7 @@ def test_meta_package_uninstall(host):
         """
     source /opt/pihole/basic-install.sh
     package_manager_detect
+    update_package_cache
     build_dependency_package
     install_dependent_packages
     """