diff --git a/.ci-farms/collabora b/.ci-farms-disabled/collabora
similarity index 100%
rename from .ci-farms/collabora
rename to .ci-farms-disabled/collabora
diff --git a/.ci-farms/google-freedreno b/.ci-farms-disabled/google-freedreno
similarity index 100%
rename from .ci-farms/google-freedreno
rename to .ci-farms-disabled/google-freedreno
diff --git a/.ci-farms/igalia b/.ci-farms-disabled/igalia
similarity index 100%
rename from .ci-farms/igalia
rename to .ci-farms-disabled/igalia
diff --git a/.ci-farms/lima b/.ci-farms-disabled/lima
similarity index 100%
rename from .ci-farms/lima
rename to .ci-farms-disabled/lima
diff --git a/.ci-farms/pengutronix b/.ci-farms-disabled/pengutronix
similarity index 100%
rename from .ci-farms/pengutronix
rename to .ci-farms-disabled/pengutronix
diff --git a/.ci-farms/vmware b/.ci-farms-disabled/vmware
similarity index 100%
rename from .ci-farms/vmware
rename to .ci-farms-disabled/vmware
diff --git a/docs/ci/uri-caching.conf b/docs/ci/uri-caching.conf
index 249998bf883..f1e448affcf 100644
--- a/docs/ci/uri-caching.conf
+++ b/docs/ci/uri-caching.conf
@@ -34,4 +34,6 @@ proxy_set_header Authorization $proxy_authorization;
 
 proxy_pass $proxyuri;
 # Redirect back to ourselves on 301 replies
+# FIXME: this is buggy, it doesn't properly url-encode $1, leading to s3 creds
+# being dropped during the redirection, breaking all the lava & baremetal jobs
 proxy_redirect ~^(.*)$ /cache/?uri=$1;