diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2572f25..e391907 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
             mediawiki
             !mediawiki/extensions/
             !mediawiki/vendor/
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v5
 
       - name: Cache Composer cache
         uses: actions/cache@v4
@@ -123,7 +123,7 @@ jobs:
             mediawiki
             mediawiki/extensions/
             mediawiki/vendor/
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v5
 
       - name: Cache Composer cache
         uses: actions/cache@v4
@@ -191,7 +191,7 @@ jobs:
                     mediawiki
                     mediawiki/extensions/
                     mediawiki/vendor/
-                key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+                key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v5
 
           - name: Cache Composer cache
             uses: actions/cache@v4
@@ -232,10 +232,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_37'
-            php: '8.0'
-          - mw: 'REL1_38'
-            php: '8.1'
           - mw: 'REL1_39'
             php: '8.2'
 
@@ -267,7 +263,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.composer/cache
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v5
 
       - name: Install MediaWiki
         if: steps.cache-mediawiki.outputs.cache-hit != 'true'
diff --git a/.github/workflows/installMediaWiki.sh b/.github/workflows/installMediaWiki.sh
index d392562..d923b9e 100644
--- a/.github/workflows/installMediaWiki.sh
+++ b/.github/workflows/installMediaWiki.sh
@@ -1,9 +1,11 @@
 #! /bin/bash
 
+set -e
+
 MW_BRANCH=$1
 EXTENSION_NAME=$2
 
-wget https://github.com/wikimedia/mediawiki/archive/$MW_BRANCH.tar.gz -nv
+wget https://github.com/wikimedia/mediawiki/archive/refs/heads/$MW_BRANCH.tar.gz -nv
 
 tar -zxf $MW_BRANCH.tar.gz
 mv mediawiki-$MW_BRANCH mediawiki
@@ -39,5 +41,11 @@ cat <<EOT >> composer.local.json
 EOT
 
 cd extensions
-git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase --branch=$MW_BRANCH --recurse-submodules -j8
-
+git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase --branch=$MW_BRANCH -j8
+
+cd Wikibase
+git submodule set-url view/lib/wikibase-serialization https://github.com/wmde/WikibaseSerializationJavaScript.git
+git submodule set-url view/lib/wikibase-data-values https://github.com/wmde/DataValuesJavaScript.git
+git submodule set-url view/lib/wikibase-data-model https://github.com/wmde/WikibaseDataModelJavaScript.git
+git submodule sync && git submodule init && git submodule update --recursive
+cd ..