diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml
index 0ee2e73a..af7ca7fb 100644
--- a/.github/workflows/build-sd-images.yml
+++ b/.github/workflows/build-sd-images.yml
@@ -155,7 +155,8 @@ jobs:
         run: |
           set -ex
           mkdir -p output
-          wget -nv "${{ inputs.test_image_url }}" | pv -i 3 > "output/${ARTIFACT_FILE?}"
+          sudo apt-get install -y pv
+          wget -nv "${{ inputs.test_image_url }}" -O - | pv -n --bytes --rate --timer -i 3 > "output/${ARTIFACT_FILE?}"
       - name: Prepare test
         run: |
           set -x
diff --git a/tests/nextcloud_tests.py b/tests/nextcloud_tests.py
index 7c4b65ce..f87152f6 100755
--- a/tests/nextcloud_tests.py
+++ b/tests/nextcloud_tests.py
@@ -180,13 +180,12 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
     test.report("password", "Wrong password" not in driver.page_source, msg="Failed to login with provided password")
 
     test.new("settings config")
-    wait = WebDriverWait(driver, 60 * wait_multiplier * 3)
-    secwarn = driver.find_element(By.CSS_SELECTOR, "#security-warning.settings-section")
-    if secwarn is None:
-        settings_config_check_pre32(wait, test)
-    else:
+    wait = WebDriverWait(driver, 60 * wait_multiplier * 5)
+    try:
+        wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, "#security-warning.settings-section")]))
         settings_config_check(wait, test)
-
+    except TimeoutException:
+        settings_config_check_pre32(wait, test)
 
     close_first_run_wizard(driver, wait_multiplier)