diff --git a/group_vars/headless.yaml b/group_vars/headless.yaml
index 415667c..c4272cf 100644
--- a/group_vars/headless.yaml
+++ b/group_vars/headless.yaml
@@ -65,7 +65,6 @@ packages_terminal:
   - wlopm
   - wlsunset
   - wtype
-  - yq-go
   - yt-dlp
   - zk
   - zoxide
diff --git a/roles/packages/defaults/main.yaml b/roles/packages/defaults/main.yaml
index 98bf4f2..f6c640f 100644
--- a/roles/packages/defaults/main.yaml
+++ b/roles/packages/defaults/main.yaml
@@ -1,4 +1,2 @@
-all_packages_to_install: "{{ lookup('community.general.merge_variables', '^packages_.*') }}"
-
 custom_repositories:
   - https://marty-oehme.github.io/void-templates
diff --git a/roles/packages/tasks/main.yaml b/roles/packages/tasks/main.yaml
index d68c10b..75784cc 100644
--- a/roles/packages/tasks/main.yaml
+++ b/roles/packages/tasks/main.yaml
@@ -9,13 +9,5 @@
 
 - name: Install all my used void packages
   community.general.xbps:
-    name: all_packages_to_install
+    name: "{{ lookup('community.general.merge_variables', '^packages_.*') }}"
     state: "{{ desired_package_state | default('present') }}"
-
-- name: Ensure yq binary points to the yq-go version
-  ansible.builtin.file:
-    src: "/usr/bin/yq-go"
-    dest: "/usr/bin/yq"
-    state: link
-  when: "'yq-go' in all_packages_to_install"
-  tags: sut