diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
index 72e4d417..eaf56762 100644
--- a/.github/workflows/ansible-lint.yml
+++ b/.github/workflows/ansible-lint.yml
@@ -58,4 +58,4 @@ jobs:
           #                         path to directories or files to skip. This option is
           #                         repeatable.
           #   -c C                  Specify configuration file to use. Defaults to ".ansible-lint"
-          args: ""
+          args: "--exclude=.github"
diff --git a/.github/workflows/test-playbooks.yml b/.github/workflows/test-playbooks.yml
index 07716c1f..bf434514 100644
--- a/.github/workflows/test-playbooks.yml
+++ b/.github/workflows/test-playbooks.yml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         component: [stratum0, stratum1, localproxy, client]
-        # Had to drop centos-7 from the matrix due to a dbus issue with the docker run command 
+        # Had to drop centos-7 from the matrix due to a dbus issue with the docker run command
         os: [rockylinux-8, ubuntu-20.04, ubuntu-22.04]
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
diff --git a/roles/create_cvmfs_content_structure/tasks/do_repo.yml b/roles/create_cvmfs_content_structure/tasks/do_repo.yml
index 12c8931c..db06e2da 100644
--- a/roles/create_cvmfs_content_structure/tasks/do_repo.yml
+++ b/roles/create_cvmfs_content_structure/tasks/do_repo.yml
@@ -17,7 +17,7 @@
         path: "/cvmfs/{{ cvmfs_repo }}/{{ item.name }}"
         state: directory
         mode: "{{ item.mode }}"
-      with_items: "{{ directories }}"
+      loop: "{{ directories | flatten }}"
       register: create_cvmfs_content_structure_create_directories
 
     - name: "Create symlinks"
@@ -26,7 +26,7 @@
         src: "{{ symlinks[item] }}"
         state: link
         force: true
-      with_items: "{{ symlinks }}"
+      loop: "{{ symlinks | flatten }}"
       register: create_cvmfs_content_structure_create_symlinks
 
     - name: "Copy files"
@@ -34,7 +34,7 @@
         src: "{{ item.name }}"
         dest: "/cvmfs/{{ cvmfs_repo }}/{{ item.dest }}"
         mode: "{{ item.mode }}"
-      with_items: "{{ files }}"
+      loop: "{{ files | flatten }}"
       register: create_cvmfs_content_structure_create_files
 
     - name: Publish transaction
diff --git a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml
index cb37809e..6d33c51a 100644
--- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml
+++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml
@@ -2,9 +2,22 @@
 # Paths for files and symlinks should be relative to the root of the repository.
 ---
 directories: # noqa: var-naming[no-role-prefix]
+  - name: defaults
+    mode: '755'
+
   - name: init/modules/EESSI
     mode: '755'
 
+  # These should exist, but we mainly list them here to prevent failures in CI (where the test repo is empty)
+  - name: versions/2025.06/compat/linux/aarch64/lib
+    mode: '775'
+
+  - name: versions/2025.06/compat/linux/riscv64/lib
+    mode: '775'
+
+  - name: versions/2025.06/compat/linux/x86_64/lib
+    mode: '775'
+
 files: # noqa: var-naming[no-role-prefix]
   - name: .cvmfsdirtab
     dest: ''
@@ -19,6 +32,18 @@ files: # noqa: var-naming[no-role-prefix]
     mode: '644'
 
 symlinks: # noqa: var-naming[no-role-prefix]
+  # defaults/amd: '$(EESSI_AMD_OVERRIDE_DEFAULT:-/dev/null)'
+  defaults/nvidia: '$(EESSI_NVIDIA_OVERRIDE_DEFAULT:-/dev/null)'
+  defaults/override: '$(EESSI_LIB_OVERRIDE_DEFAULT:-/dev/null)'
   host_injections: '$(EESSI_HOST_INJECTIONS:-/opt/eessi)'
   init/modules/EESSI/2023.06.lua: /cvmfs/software.eessi.io/versions/2023.06/init/modules/EESSI/2023.06.lua
   init/modules/EESSI/2025.06.lua: /cvmfs/software.eessi.io/versions/2025.06/init/modules/EESSI/2025.06.lua
+  # versions/2025.06/compat/linux/aarch64/lib/amd: '$(EESSI_202506_AMD_OVERRIDE:-/cvmfs/software.eessi.io/defaults/amd)'
+  # versions/2025.06/compat/linux/riscv64/lib/amd: '$(EESSI_202506_AMD_OVERRIDE:-/cvmfs/software.eessi.io/defaults/amd)'
+  # versions/2025.06/compat/linux/x86_64/lib/amd: '$(EESSI_202506_AMD_OVERRIDE:-/cvmfs/software.eessi.io/defaults/amd)'
+  versions/2025.06/compat/linux/aarch64/lib/nvidia: '$(EESSI_202506_NVIDIA_OVERRIDE:-/cvmfs/software.eessi.io/defaults/nvidia)'
+  versions/2025.06/compat/linux/riscv64/lib/nvidia: '$(EESSI_202506_NVIDIA_OVERRIDE:-/cvmfs/software.eessi.io/defaults/nvidia)'
+  versions/2025.06/compat/linux/x86_64/lib/nvidia: '$(EESSI_202506_NVIDIA_OVERRIDE:-/cvmfs/software.eessi.io/defaults/nvidia)'
+  versions/2025.06/compat/linux/aarch64/lib/override: '$(EESSI_202506_LIB_OVERRIDE:-/cvmfs/software.eessi.io/defaults/override)'
+  versions/2025.06/compat/linux/riscv64/lib/override: '$(EESSI_202506_LIB_OVERRIDE:-/cvmfs/software.eessi.io/defaults/override)'
+  versions/2025.06/compat/linux/x86_64/lib/override: '$(EESSI_202506_LIB_OVERRIDE:-/cvmfs/software.eessi.io/defaults/override)'