diff --git a/setup_repos.py b/data/setup_repos.py
similarity index 100%
rename from setup_repos.py
rename to data/setup_repos.py
diff --git a/updvercheck.py b/data/updvercheck.py
old mode 100644
new mode 100755
similarity index 100%
rename from updvercheck.py
rename to data/updvercheck.py
diff --git a/data/video.ogv b/data/video.ogv
new file mode 100644
index 00000000..9bd6dbfd
Binary files /dev/null and b/data/video.ogv differ
diff --git a/lib/utils.pm b/lib/utils.pm
index 906b33be..5596072f 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -474,7 +474,7 @@ sub repos_mirrorlist {
 sub get_setup_repos_script {
     # ensure the 'setup_repos.py' downloader script is present
     if (script_run "ls /usr/local/bin/setup_repos.py") {
-        assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o /usr/local/bin/setup_repos.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/setup_repos.py', timeout => 180;
+        assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o /usr/local/bin/setup_repos.py ' . autoinst_url . '/data/setup_repos.py', timeout => 180;
         assert_script_run 'chmod ugo+x /usr/local/bin/setup_repos.py';
     }
 }
@@ -1297,7 +1297,7 @@ sub advisory_check_nonmatching_packages {
     # ensure python3-dnf is present for the check script
     assert_script_run 'dnf -y install python3-dnf' unless (get_var("CANNED"));
     # download the check script and run it
-    assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o updvercheck.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/updvercheck.py', timeout => 180;
+    assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o updvercheck.py ' . autoinst_url . '/data/updvercheck.py', timeout => 180;
     my $advisory = get_var("ADVISORY");
     my $cmd = 'python3 ./updvercheck.py /mnt/updatepkgs.txt /tmp/installedupdatepkgs.txt';
     $cmd .= " $advisory" if ($advisory);
diff --git a/tests/applications/navigation/aaa_setup.pm b/tests/applications/navigation/aaa_setup.pm
index baaf89f5..754b770a 100644
--- a/tests/applications/navigation/aaa_setup.pm
+++ b/tests/applications/navigation/aaa_setup.pm
@@ -26,7 +26,7 @@ sub run {
     else {
         assert_script_run("dnf install -y extremetuxracer", timeout => 180);
     }
-    assert_script_run("curl -O https://pagure.io/fedora-qa/openqa_testdata/blob/thetree/f/video/video.ogv", timeout => 120);
+    assert_script_run("curl -O " . autoinst_url . "/data/video.ogv", timeout => 120);
     # Put the downloaded video in the Videos folder
     assert_script_run("mv video.ogv /home/$user/Videos/");
     desktop_vt();