diff --git a/.github/jobs/free_disk_space.sh b/.github/jobs/free_disk_space.sh
index cfe30cf06..ef4d5d447 100755
--- a/.github/jobs/free_disk_space.sh
+++ b/.github/jobs/free_disk_space.sh
@@ -10,6 +10,41 @@ sudo rm -rf /opt/ghc
 sudo rm -rf "/usr/local/share/boost"
 sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
+###
+# more cleanup taken from https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh
+###
+
+echo "=============================================================================="
+echo "Freeing up disk space on CI system"
+echo "=============================================================================="
+
+echo "Listing 100 largest packages"
+dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 100
+df -h
+echo "Removing large packages"
+sudo apt-get remove -y '^dotnet-.*'
+sudo apt-get remove -y '^llvm-.*'
+sudo apt-get remove -y 'php.*'
+sudo apt-get remove -y '^mongodb-.*'
+sudo apt-get remove -y '^mysql-.*'
+sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
+sudo apt-get autoremove -y
+sudo apt-get clean
+df -h
+echo "Removing large directories"
+
+sudo rm -rf /usr/share/dotnet/
+sudo rm -rf /usr/local/graalvm/
+sudo rm -rf /usr/local/.ghcup/
+sudo rm -rf /usr/local/share/powershell
+sudo rm -rf /usr/local/share/chromium
+sudo rm -rf /usr/local/lib/android
+sudo rm -rf /usr/local/lib/node_modules
+
+###
+# end cleanup from azure script
+###
+
 printf "\nChecking disk usage after cleanup"
 
 df -h
diff --git a/.github/jobs/get_metviewer.sh b/.github/jobs/get_metviewer.sh
index 5cf105845..e53b18bbd 100755
--- a/.github/jobs/get_metviewer.sh
+++ b/.github/jobs/get_metviewer.sh
@@ -4,13 +4,13 @@
 export METVIEWER_DATA=$RUNNER_WORKSPACE
 export MYSQL_DIR=$RUNNER_WORKSPACE/mysql
 export METVIEWER_DIR=$RUNNER_WORKSPACE/output/metviewer
-export METVIEWER_DOCKER_IMAGE=dtcenter/metviewer:develop
+export METVIEWER_DOCKER_IMAGE=dtcenter/metviewer:main_v5.1
 
 # install docker-compose
 apk add docker-cli-compose
 
 # download docker-compose.yml file from METviewer develop branch
-wget https://raw.githubusercontent.com/dtcenter/METviewer/develop/docker/docker-compose.yml
+wget https://raw.githubusercontent.com/dtcenter/METviewer/develop/internal/scripts/docker/docker-compose.yml
 
 # Run docker-compose to create the containers
 docker compose up -d
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 6d7398599..20539492d 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -92,6 +92,8 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
+      - name: Free disk space
+        run: .github/jobs/free_disk_space.sh
       - name: Get METplus Image
         run: .github/jobs/docker_setup.sh
         env: