diff --git a/.github/workflows/setup-xapi-environment/action.yml b/.github/workflows/setup-xapi-environment/action.yml
index 72700599cf2..ed9b7793bbe 100644
--- a/.github/workflows/setup-xapi-environment/action.yml
+++ b/.github/workflows/setup-xapi-environment/action.yml
@@ -12,6 +12,8 @@ runs:
       shell: bash
       run: |
         curl --fail --silent https://raw.githubusercontent.com/xapi-project/xs-opam/master/tools/xs-opam-ci.env | cut -f2 -d " " > .env
+        cat /etc/os-release >>.env
+        cat .env
 
     - name: Download XE_SR_ERRORCODES.xml
       shell: bash
@@ -52,6 +54,7 @@ runs:
           xs-opam: ${{ steps.dotenv.outputs.repository }}
         dune-cache: true
         opam-pin: false
+        cache-prefix: v3-${{ env.ID }}-${{ env.VERSION_ID }}
       env:
         DUNE_CACHE_STORAGE_MODE: copy