diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 87be1c9..94b9439 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -184,6 +184,26 @@ jobs:
         sed -i "s/'elasticsearch-host' => 'localhost'/'elasticsearch-host' => '127.0.0.1'/" etc/install-config-mysql.php.dist
         sed -i "s/'amqp-host' => 'localhost'/'amqp-host' => '127.0.0.1'/" etc/install-config-mysql.php.dist
 
+    # mysql server 5.7 doesn't have the column-statistics expected by mysql client 8 (failing 2.3.7-p* builds)
+    - name: Switch from mysql-client 8 to mysql-client 5.7
+      if: |
+        steps.magento-version.outputs.version == '"2.3.7-p3"' || steps.magento-version.outputs.version == '"2.3.7-p4"'
+      run: |
+        mkdir -p /tmp/mysql-5.7
+        cd /tmp/mysql-5.7
+        sudo apt-get purge mysql-server mysql-client mysql-common mysql-server-core-* mysql-client-core-*
+        sudo rm -rf /etc/mysql /var/lib/mysql
+        sudo apt-get autoremove
+        sudo apt-get autoclean
+        wget --quiet https://downloads.mysql.com/archives/get/p/23/file/mysql-server_5.7.30-1ubuntu18.04_amd64.deb-bundle.tar
+        tar -xf mysql-server_5.7.30-1ubuntu18.04_amd64.deb-bundle.tar
+        sudo dpkg -i mysql-common_5.7.30-1ubuntu18.04_amd64.deb
+        sudo dpkg -i libmysqlclient20_5.7.30-1ubuntu18.04_amd64.deb
+        sudo dpkg -i mysql-community-client_5.7.30-1ubuntu18.04_amd64.deb
+        sudo dpkg -i mysql-client_5.7.30-1ubuntu18.04_amd64.deb
+        sudo dpkg -i libmysqlclient20_5.7.30-1ubuntu18.04_amd64.deb
+        mysqldump --version
+
     - run: ${{ inputs.test_command }}
       working-directory:  ${{ inputs.magento_directory }}/dev/tests/integration
       name: Run Integration Tests
@@ -192,7 +212,7 @@ jobs:
       uses: actions/upload-artifact@v3
       if: failure()
       with:
-        name: sandbox-data
+        name: sandbox-data-${{ steps.magento-version.outputs.version }}
         path: /home/runner/work/infrastructure/magento2/dev/tests/integration/tmp/sandbox-*
         retention-days: 3