diff --git a/.github/workflows/spread-scheduled.yaml b/.github/workflows/spread-scheduled.yaml
index 0821898312..9d649ac937 100644
--- a/.github/workflows/spread-scheduled.yaml
+++ b/.github/workflows/spread-scheduled.yaml
@@ -87,7 +87,7 @@ jobs:
       fail-fast: false
       matrix:
         system:
-          - ubuntu-20.04-64
+          - ubuntu-22.04-64
           - fedora-39-64
     steps:
       - name: Cleanup job workspace
diff --git a/tests/spread/core24/remote-build/task.yaml b/tests/spread/core24/remote-build/task.yaml
index 8ccdc34bcb..cacb0deac3 100644
--- a/tests/spread/core24/remote-build/task.yaml
+++ b/tests/spread/core24/remote-build/task.yaml
@@ -16,6 +16,7 @@ prepare: |
 
   # Commit the project
   git config --global --add safe.directory "$PWD"
+  git init
   git add snap/snapcraft.yaml
   git commit -m "Initial Commit"
 
diff --git a/tests/spread/general/remote-build/task.yaml b/tests/spread/general/remote-build/task.yaml
index ec10689f4a..96661e5292 100644
--- a/tests/spread/general/remote-build/task.yaml
+++ b/tests/spread/general/remote-build/task.yaml
@@ -1,6 +1,9 @@
 summary: Test the remote builder
 manual: true
 kill-timeout: 180m
+systems:
+  - fedora-39-64
+  - ubuntu-22.04*
 
 environment:
   LAUNCHPAD_TOKEN: "$(HOST: echo ${LAUNCHPAD_TOKEN})"
@@ -17,12 +20,18 @@ prepare: |
 
   # Commit the project
   git config --global --add safe.directory "$PWD"
+  git init
   git add snap/snapcraft.yaml
   git commit -m "Initial Commit"
 
   # Setup launchpad token
-  mkdir -p ~/.local/share/snapcraft/provider/launchpad/
-  echo -e "$LAUNCHPAD_TOKEN" >> ~/.local/share/snapcraft/provider/launchpad/credentials
+  if [[ $STRATEGY == "disable-fallback" ]]; then
+    mkdir -p ~/.local/share/snapcraft/
+    echo -e "$LAUNCHPAD_TOKEN" >> ~/.local/share/snapcraft/launchpad-credentials
+  else
+    mkdir -p ~/.local/share/snapcraft/provider/launchpad/
+    echo -e "$LAUNCHPAD_TOKEN" >> ~/.local/share/snapcraft/provider/launchpad/credentials
+  fi
 
 restore: |
   rm -f ./*.snap ./*.txt