diff --git a/roles/create_cvmfs_content_structure/files/EESSI-modulerc b/roles/create_cvmfs_content_structure/files/EESSI-modulerc
new file mode 100644
index 00000000..e36ba98e
--- /dev/null
+++ b/roles/create_cvmfs_content_structure/files/EESSI-modulerc
@@ -0,0 +1,2 @@
+-- hide EESSI/2025.06 module until software layer has enough installations in it
+hide_version("EESSI/2025.06")
diff --git a/roles/create_cvmfs_content_structure/tasks/do_repo.yml b/roles/create_cvmfs_content_structure/tasks/do_repo.yml
index 06ccf2d4..977acb00 100644
--- a/roles/create_cvmfs_content_structure/tasks/do_repo.yml
+++ b/roles/create_cvmfs_content_structure/tasks/do_repo.yml
@@ -10,6 +10,14 @@
 
 - name: Apply changes to CVMFS repository, if there are any
   block:
+  - name: "Create directories"
+    ansible.builtin.file:
+      path: "/cvmfs/{{ cvmfs_repo }}/{{ item.name }}"
+      state: directory
+      mode: "{{ item.mode }}"
+    with_items: "{{ directories }}"
+    register: create_directories
+
   - name: "Create symlinks"
     ansible.builtin.file:
       path: "/cvmfs/{{ cvmfs_repo }}/{{ item }}"
@@ -41,7 +49,7 @@
 
   rescue:
     - name: Abort transaction
-      ansible.builtin.command: "cvmfs_server abort {{ cvmfs_repo }}"
+      ansible.builtin.command: "cvmfs_server abort -f {{ cvmfs_repo }}"
       when: cvmfs_start_transaction and cvmfs_abort_transaction_on_failures
 
     - name: Exit because of failure
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 745e1145..fe92a7c3 100644
--- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml
+++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml
@@ -1,6 +1,10 @@
 # Specifications of files and symlinks for the software.eessi.io CVMFS repository.
 # Paths for files and symlinks should be relative to the root of the repository.
 ---
+directories:
+  - name: init/modules/EESSI
+    mode: '755'
+
 files:
   - name: .cvmfsdirtab
     dest: ''
@@ -10,5 +14,11 @@ files:
     dest: ''
     mode: '644'
 
+  - name: EESSI-modulerc
+    dest: 'init/modules/EESSI/.modulerc.lua'
+    mode: '644'
+
 symlinks:
   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