diff --git a/group_vars/headless.yaml b/group_vars/headless.yaml
index c4272cf..415667c 100644
--- a/group_vars/headless.yaml
+++ b/group_vars/headless.yaml
@@ -65,6 +65,7 @@ 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 f6c640f..98bf4f2 100644
--- a/roles/packages/defaults/main.yaml
+++ b/roles/packages/defaults/main.yaml
@@ -1,2 +1,4 @@
+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 75784cc..d68c10b 100644
--- a/roles/packages/tasks/main.yaml
+++ b/roles/packages/tasks/main.yaml
@@ -9,5 +9,13 @@
 
 - name: Install all my used void packages
   community.general.xbps:
-    name: "{{ lookup('community.general.merge_variables', '^packages_.*') }}"
+    name: all_packages_to_install
     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