diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml
index 4fd69a0c482..2fcc198476d 100644
--- a/.gitlab-ci/farm-rules.yml
+++ b/.gitlab-ci/farm-rules.yml
@@ -34,7 +34,6 @@
 #   anholt           | (decommissioned)                 | @anholt
 #   austriancoder    | ci-tron                          | @austriancoder
 #   collabora        | lava                             | @daniels, @sergi
-#   google-freedreno | none (moving to LAVA)            | @daniels, @sergi
 #   igalia           | baremetal/poe-powered, ci-tron   | @jasuarez, @chema
 #   lima             | lava                             | @enunes
 #   microsoft        | custom                           | @jenatali, @alatiera
@@ -293,15 +292,6 @@
     - !reference [.pengutronix-farm-rules, rules]
 
 
-# Temporary placeholder as the devices move across to LAVA.
-.google-freedreno-farm-rules:
-  rules:
-    - when: never
-
-.google-freedreno-farm-manual-rules:
-  rules:
-    - when: never
-
 # Skip container & build jobs when disabling any farm, and run them if any
 # farm gets re-enabled.
 # Only apply these rules in MR context, because otherwise we get a false
diff --git a/.gitlab-ci/report-flakes.py b/.gitlab-ci/report-flakes.py
index ed7009c9bd6..6aada5bf845 100644
--- a/.gitlab-ci/report-flakes.py
+++ b/.gitlab-ci/report-flakes.py
@@ -118,7 +118,6 @@ def main():
     # before we make it to 9-digit jobs (we're at 7 so far).
     nick = args.runner
     nick = nick.replace('mesa-', '')
-    nick = nick.replace('google-freedreno-', '')
     nick += f'-{args.job}'
     irc.send_line(f"NICK {nick}")
     irc.send_line(f"USER {nick} unused unused: Gitlab CI Notifier")
diff --git a/.pick_status.json b/.pick_status.json
index 321b86cd2f0..3df1191de71 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -794,7 +794,7 @@
         "description": "ci: drop google-freedreno remnants",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "6541b911bd7a6efa27bcda7021bd0b2763699e41",
         "notes": null