diff --git a/.github/workflows/build-test-release-client-packages.yml b/.github/workflows/build-test-release-client-packages.yml
index 856c3d60..a12d6eb7 100644
--- a/.github/workflows/build-test-release-client-packages.yml
+++ b/.github/workflows/build-test-release-client-packages.yml
@@ -36,6 +36,12 @@ jobs:
           echo "localhost ansible_connection=local" > inventory/hosts
           ansible-playbook ./prepare-client-packages.yml
 
+      - name: Include the old eessi-hpc.org config as well for now
+        run: |
+          wget https://github.com/EESSI/filesystem-layer/releases/download/v0.4.0/cvmfs-config-eessi-0.4.0.tar
+          tar -C ./package -xf cvmfs-config-eessi-0.4.0.tar
+          rm cvmfs-config-eessi-0.4.0.tar
+
 # We probably should loop over the set {rpm,deb,osxpkg} to create packages, but
 # it will make debugging more annoying.
 
@@ -122,6 +128,9 @@ jobs:
       - name: Download and install CVMFS client
         run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb && sudo dpkg -i cvmfs-release-latest_all.deb
 
+      - name: Download and install cvmfs-config-none package
+        run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-none_1.1-0_all.deb && sudo dpkg -i cvmfs-config-none_1.1-0_all.deb
+
       - name: Install CVMFS client
         run: sudo apt-get update && sudo apt-get install cvmfs
 
@@ -158,10 +167,10 @@ jobs:
 
     steps:
       - name: Download and install CVMFS client
-        run: yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm
+        run: yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm && yum-config-manager --enable cernvm-config
 
       - name: Install CVMFS client
-        run: yum install -y cvmfs
+        run: yum install -y cvmfs cvmfs-config-none
 
       - name: Download cvmfs-config-eessi package
         uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
@@ -198,6 +207,9 @@ jobs:
       - name: Download and install CVMFS client
         run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb && sudo dpkg -i cvmfs-release-latest_all.deb
 
+      - name: Download and install cvmfs-config-none package
+        run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-none_1.1-0_all.deb && sudo dpkg -i cvmfs-config-none_1.1-0_all.deb
+
       - name: Install CVMFS client
         run: sudo apt-get update && sudo apt-get install cvmfs