diff --git a/.github/actions/build-libmysqlclient/action.yml b/.github/actions/build-libmysqlclient/action.yml
index 80a213ada56..bab2bc544a1 100644
--- a/.github/actions/build-libmysqlclient/action.yml
+++ b/.github/actions/build-libmysqlclient/action.yml
@@ -15,10 +15,9 @@ runs:
         set -x
         LIBMYSQL=${{ inputs.libmysql }}
         MYSQL_BASE=${LIBMYSQL%%-linux-*}
-        MYSQL_VERSION=${MYSQL_BASE#*-}
         MYSQL_DIR=$HOME/$MYSQL_BASE
         mkdir -p $MYSQL_DIR
-        URL=https://cdn.mysql.com/Downloads/MySQL-${MYSQL_VERSION%.*}/$LIBMYSQL
+        URL=https://downloads.mysql.com/archives/get/p/23/file/$LIBMYSQL
         wget -nv $URL
         tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
         PDO_MYSQL=${MYSQL_DIR}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f8d618a1e08..eb4582abebb 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -745,7 +745,7 @@ jobs:
         uses: ./.github/actions/build-libmysqlclient
         with:
           configurationParameters: --enable-werror
-          libmysql: mysql-8.0.35-linux-glibc2.28-x86_64.tar.xz
+          libmysql: mysql-8.0.36-linux-glibc2.28-x86_64.tar.xz
           withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Test mysql-8.0
         uses: ./.github/actions/test-libmysqlclient