diff --git a/.github/workflows/setup-xapi-environment/action.yml b/.github/workflows/setup-xapi-environment/action.yml
index 72700599cf2..6f97e81202b 100644
--- a/.github/workflows/setup-xapi-environment/action.yml
+++ b/.github/workflows/setup-xapi-environment/action.yml
@@ -23,6 +23,11 @@ runs:
       id: dotenv
       uses: falti/dotenv-action@v1
 
+    - name: Load environment file
+      id: dotenv
+      uses: falti/dotenv-action@v1
+        path: /etc/os-release
+
     - name: Update Ubuntu repositories
       shell: bash
       run: sudo apt-get update
@@ -52,6 +57,7 @@ runs:
           xs-opam: ${{ steps.dotenv.outputs.repository }}
         dune-cache: true
         opam-pin: false
+        cache-prefix: v3-${{ ID }}-${{ VERSION_ID }}
       env:
         DUNE_CACHE_STORAGE_MODE: copy