diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 0a6ef853..886bf2d8 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -122,16 +122,16 @@ jobs:
         run: |
           # Extract major.minor from version (e.g., "8.0.36-28" -> "8.0")
           MAJOR_MINOR=$(echo "$PERCONA_VERSION" | grep -oP '^\d+\.\d+')
-          GLIBC="glibc2.17"
+          GLIBC="glibc2.35"
           TARBALL="Percona-Server-${PERCONA_VERSION}-Linux.x86_64.${GLIBC}-minimal.tar.gz"
           URL="https://downloads.percona.com/downloads/Percona-Server-${MAJOR_MINOR}/Percona-Server-${PERCONA_VERSION}/binary/tarball/${TARBALL}"
-          echo "Downloading Percona Server ${PERCONA_VERSION}..."
+          echo "Downloading Percona Server ${PERCONA_VERSION} (${GLIBC})..."
           mkdir -p "$SANDBOX_BINARY"
           curl -L -f -o "/tmp/$TARBALL" "$URL" || {
-            GLIBC="glibc2.35"
+            GLIBC="glibc2.17"
             TARBALL="Percona-Server-${PERCONA_VERSION}-Linux.x86_64.${GLIBC}-minimal.tar.gz"
             URL="https://downloads.percona.com/downloads/Percona-Server-${MAJOR_MINOR}/Percona-Server-${PERCONA_VERSION}/binary/tarball/${TARBALL}"
-            echo "Retrying with glibc2.35..."
+            echo "Retrying with glibc2.17..."
             curl -L -f -o "/tmp/$TARBALL" "$URL"
           }
           ./dbdeployer unpack "/tmp/$TARBALL" --sandbox-binary="$SANDBOX_BINARY"
@@ -169,8 +169,8 @@ jobs:
       fail-fast: false
       matrix:
         mariadb-version:
-          - '10.11.25'
-          - '11.4.10'
+          - '10.11.9'
+          - '11.4.5'
     env:
       GO111MODULE: on
       SANDBOX_BINARY: ${{ github.workspace }}/opt/mysql
@@ -192,8 +192,8 @@ jobs:
 
       - name: Download and unpack MariaDB
         run: |
-          TARBALL="mariadb-${MARIADB_VERSION}-linux-x86_64.tar.gz"
-          URL="https://downloads.mariadb.com/MariaDB/mariadb-${MARIADB_VERSION}/bintar-linux-x86_64/${TARBALL}"
+          TARBALL="mariadb-${MARIADB_VERSION}-linux-systemd-x86_64.tar.gz"
+          URL="https://archive.mariadb.org/mariadb-${MARIADB_VERSION}/bintar-linux-systemd-x86_64/${TARBALL}"
           echo "Downloading MariaDB ${MARIADB_VERSION}..."
           mkdir -p "$SANDBOX_BINARY"
           curl -L -f -o "/tmp/$TARBALL" "$URL"
@@ -253,7 +253,7 @@ jobs:
       - name: Download MySQL versions
         run: |
           mkdir -p "$SANDBOX_BINARY"
-          for VER in 5.7.44 8.0.42 8.4.8 9.5.0; do
+          for VER in 8.0.42 8.4.8 9.5.0; do
             SHORT="${VER%.*}"
             TARBALL="mysql-${VER}-linux-glibc2.17-x86_64-minimal.tar.xz"
             echo "Downloading $VER..."
@@ -269,7 +269,7 @@ jobs:
 
       - name: Run ts replication tests (MySQL)
         env:
-          TEST_SHORT_VERSIONS: "5.7,8.0,8.4,9.5"
+          TEST_SHORT_VERSIONS: "8.0,8.4,9.5"
         run: |
           export HOME="$GITHUB_WORKSPACE/home"
           mkdir -p "$HOME/sandboxes" "$HOME/.dbdeployer"
@@ -403,6 +403,8 @@ jobs:
           PG_FULL=$(ls ~/opt/postgresql/ | head -1)
           echo "=== Deploying PostgreSQL $PG_FULL multiple (3 nodes) ==="
           ./dbdeployer deploy multiple "$PG_FULL" --provider=postgresql --nodes=3
+          echo "=== Waiting for nodes to start ==="
+          sleep 5
           echo "=== Checking topology dir ==="
           ls ~/sandboxes/multi_msb_*/
           echo "=== Connect to node1 ==="
diff --git a/downloads/tarball_list.json b/downloads/tarball_list.json
index 24f5a257..12ae1b31 100644
--- a/downloads/tarball_list.json
+++ b/downloads/tarball_list.json
@@ -3121,188 +3121,6 @@
       "notes": "added with version 2.0.0",
       "date_added": "2026-03-24 00:00"
     },
-    {
-      "name": "mariadb-10.6.25-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.25/bintar-linux-x86_64/mariadb-10.6.25-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "10.6",
-      "version": "10.6.25",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-10.6.25-linux-aarch64.tar.gz",
-      "OS": "Linux",
-      "arch": "arm64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.25/bintar-linux-aarch64/mariadb-10.6.25-linux-aarch64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "10.6",
-      "version": "10.6.25",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-10.11.25-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.11.25/bintar-linux-x86_64/mariadb-10.11.25-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "10.11",
-      "version": "10.11.25",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-10.11.25-linux-aarch64.tar.gz",
-      "OS": "Linux",
-      "arch": "arm64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.11.25/bintar-linux-aarch64/mariadb-10.11.25-linux-aarch64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "10.11",
-      "version": "10.11.25",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.0.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.0.10/bintar-linux-x86_64/mariadb-11.0.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.0",
-      "version": "11.0.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.1.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.1.10/bintar-linux-x86_64/mariadb-11.1.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.1",
-      "version": "11.1.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.2.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.2.10/bintar-linux-x86_64/mariadb-11.2.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.2",
-      "version": "11.2.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.3.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.3.10/bintar-linux-x86_64/mariadb-11.3.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.3",
-      "version": "11.3.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.4.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.4.10/bintar-linux-x86_64/mariadb-11.4.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.4",
-      "version": "11.4.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.4.10-linux-aarch64.tar.gz",
-      "OS": "Linux",
-      "arch": "arm64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.4.10/bintar-linux-aarch64/mariadb-11.4.10-linux-aarch64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.4",
-      "version": "11.4.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.5.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.5.10/bintar-linux-x86_64/mariadb-11.5.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.5",
-      "version": "11.5.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.6.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.6.10/bintar-linux-x86_64/mariadb-11.6.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.6",
-      "version": "11.6.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.7.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.7.10/bintar-linux-x86_64/mariadb-11.7.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.7",
-      "version": "11.7.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
-    {
-      "name": "mariadb-11.8.10-linux-x86_64.tar.gz",
-      "OS": "Linux",
-      "arch": "amd64",
-      "url": "https://downloads.mariadb.com/MariaDB/mariadb-11.8.10/bintar-linux-x86_64/mariadb-11.8.10-linux-x86_64.tar.gz",
-      "flavor": "mariadb",
-      "minimal": false,
-      "size": 0,
-      "short_version": "11.8",
-      "version": "11.8.10",
-      "notes": "added with version 2.1.1",
-      "date_added": "2026-04-05 00:00"
-    },
     {
       "name": "Percona-Server-5.7.41-44-Linux.x86_64.glibc2.17-minimal.tar.gz",
       "OS": "Linux",
@@ -3484,6 +3302,71 @@
       "version": "8.4.4",
       "notes": "added with version 2.1.1",
       "date_added": "2026-04-05 00:00"
+    },
+    {
+      "name": "mariadb-10.6.9-linux-systemd-x86_64.tar.gz",
+      "OS": "Linux",
+      "arch": "amd64",
+      "url": "https://archive.mariadb.org/mariadb-10.6.9/bintar-linux-systemd-x86_64/mariadb-10.6.9-linux-systemd-x86_64.tar.gz",
+      "flavor": "mariadb",
+      "minimal": false,
+      "size": 0,
+      "short_version": "10.6",
+      "version": "10.6.9",
+      "notes": "archive.mariadb.org LTS",
+      "date_added": "2026-04-02 00:00"
+    },
+    {
+      "name": "mariadb-10.11.9-linux-systemd-x86_64.tar.gz",
+      "OS": "Linux",
+      "arch": "amd64",
+      "url": "https://archive.mariadb.org/mariadb-10.11.9/bintar-linux-systemd-x86_64/mariadb-10.11.9-linux-systemd-x86_64.tar.gz",
+      "flavor": "mariadb",
+      "minimal": false,
+      "size": 0,
+      "short_version": "10.11",
+      "version": "10.11.9",
+      "notes": "archive.mariadb.org LTS",
+      "date_added": "2026-04-02 00:00"
+    },
+    {
+      "name": "mariadb-11.4.5-linux-systemd-x86_64.tar.gz",
+      "OS": "Linux",
+      "arch": "amd64",
+      "url": "https://archive.mariadb.org/mariadb-11.4.5/bintar-linux-systemd-x86_64/mariadb-11.4.5-linux-systemd-x86_64.tar.gz",
+      "flavor": "mariadb",
+      "minimal": false,
+      "size": 0,
+      "short_version": "11.4",
+      "version": "11.4.5",
+      "notes": "archive.mariadb.org LTS",
+      "date_added": "2026-04-02 00:00"
+    },
+    {
+      "name": "mariadb-11.4.9-linux-systemd-x86_64.tar.gz",
+      "OS": "Linux",
+      "arch": "amd64",
+      "url": "https://archive.mariadb.org/mariadb-11.4.9/bintar-linux-systemd-x86_64/mariadb-11.4.9-linux-systemd-x86_64.tar.gz",
+      "flavor": "mariadb",
+      "minimal": false,
+      "size": 0,
+      "short_version": "11.4",
+      "version": "11.4.9",
+      "notes": "archive.mariadb.org LTS",
+      "date_added": "2026-04-02 00:00"
+    },
+    {
+      "name": "mariadb-11.8.6-linux-systemd-x86_64.tar.gz",
+      "OS": "Linux",
+      "arch": "amd64",
+      "url": "https://archive.mariadb.org/mariadb-11.8.6/bintar-linux-systemd-x86_64/mariadb-11.8.6-linux-systemd-x86_64.tar.gz",
+      "flavor": "mariadb",
+      "minimal": false,
+      "size": 0,
+      "short_version": "11.8",
+      "version": "11.8.6",
+      "notes": "archive.mariadb.org short-term",
+      "date_added": "2026-04-02 00:00"
     }
   ]
 }
diff --git a/sandbox/innodb_cluster.go b/sandbox/innodb_cluster.go
index c181d475..2053473f 100644
--- a/sandbox/innodb_cluster.go
+++ b/sandbox/innodb_cluster.go
@@ -197,8 +197,7 @@ func CreateInnoDBCluster(sandboxDef SandboxDef, origin string, nodes int, master
 	// InnoDB Cluster always uses single-primary mode by default
 	// The primary is node 1, the rest are secondaries
 	masterList := "1"
-	slaveList := makeNodesList(nodes)
-	slaveList = ""
+	slaveList := ""
 	for N := 2; N <= nodes; N++ {
 		if slaveList != "" {
 			slaveList += " "
diff --git a/ts/templates/multi-source/all-masters.tmpl b/ts/templates/multi-source/all-masters.tmpl
index dffed015..11f1d286 100644
--- a/ts/templates/multi-source/all-masters.tmpl
+++ b/ts/templates/multi-source/all-masters.tmpl
@@ -24,8 +24,8 @@ exec $sb_dir/check_ms_nodes
 stdout '# Master 1'
 stdout '# Master 2'
 stdout '# Master 3'
-stdout -count=6 'Slave_IO_Running: Yes'
-stdout -count=6 'Slave_SQL_Running: Yes'
+stdout -count=6 '(Slave|Replica)_IO_Running: Yes'
+stdout -count=6 '(Slave|Replica)_SQL_Running: Yes'
 ! stderr .
 
 check_sandbox_manifest $sb_dir multi_source
diff --git a/ts/templates/multi-source/fan-in.tmpl b/ts/templates/multi-source/fan-in.tmpl
index 866844f8..2ebc8164 100644
--- a/ts/templates/multi-source/fan-in.tmpl
+++ b/ts/templates/multi-source/fan-in.tmpl
@@ -23,8 +23,8 @@ exists $sb_dir
 exec $sb_dir/check_ms_nodes
 stdout '# Master 1'
 stdout '# Master 2'
-stdout -count=2 'Slave_IO_Running: Yes'
-stdout -count=2 'Slave_SQL_Running: Yes'
+stdout -count=2 '(Slave|Replica)_IO_Running: Yes'
+stdout -count=2 '(Slave|Replica)_SQL_Running: Yes'
 ! stderr .
 
 check_sandbox_manifest $sb_dir multi_source
@@ -33,6 +33,7 @@ env required_ports=3
 [version_is_at_least:$db_version:8.0.0] env required_ports=6
 check_ports $sb_dir $required_ports
 
+sleep 3
 exec $HOME/sandboxes/fan_in_msb_{{.DbPathVer}}/test_replication
 stdout '# fail: 0'
 ! stderr .