diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51fca5c2..5f8eecf0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,27 +160,26 @@ jobs:
                 php_version: ['8.3', '8.4']
         steps:
             - uses: actions/checkout@v4
-            - name: Run Unit tests
+            - name: Prepare SQLSRV environment
               run: |
-                  git config --global --add safe.directory $GITHUB_WORKSPACE
-                  apt-get update
-                  apt-get install -y software-properties-common lsb-release gnupg
-                  curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-                  echo "deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" >> /etc/apt/sources.list
+                  curl -sSL -O https://packages.microsoft.com/config/debian/$(grep VERSION_ID /etc/os-release | cut -d '"' -f 2 | cut -d '.' -f 1)/packages-microsoft-prod.deb
+                  dpkg -i packages-microsoft-prod.deb
+                  rm packages-microsoft-prod.deb
                   apt-get update
                   ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev
                   pecl install sqlsrv && docker-php-ext-enable sqlsrv
-                  pecl install pdo_sqlsrv && docker-php-ext-enable pdo_sqlsrv
                   php --ri sqlsrv
-                  php --ri pdo_sqlsrv
+            - name: Run Unit tests
+              run: |
+                  git config --global --add safe.directory $GITHUB_WORKSPACE
                   composer update
                   ./vendor/bin/phpunit --configuration phpunit.sqlsrv.xml.dist
         services:
             sqlsrv:
                 image: mcr.microsoft.com/mssql/server:2017-latest
                 env:
-                    SA_PASSWORD: Password12!
                     ACCEPT_EULA: Y
+                    MSSQL_SA_PASSWORD: Password12!
                     MSSQL_PID: Developer
 
     tests-unit-windows:
diff --git a/phpunit.sqlsrv.xml.dist b/phpunit.sqlsrv.xml.dist
index e0018482..a5691724 100644
--- a/phpunit.sqlsrv.xml.dist
+++ b/phpunit.sqlsrv.xml.dist
@@ -5,7 +5,7 @@
 		<env name="JOOMLA_TEST_DB_HOST" value="sqlsrv" />
 		<env name="JOOMLA_TEST_DB_PORT" value="1433" />
 		<env name="JOOMLA_TEST_DB_USER" value="sa" />
-		<env name="JOOMLA_TEST_DB_PASSWORD" value="JoomlaFramework123" />
+		<env name="JOOMLA_TEST_DB_PASSWORD" value="Password12!" />
 		<env name="JOOMLA_TEST_DB_DATABASE" value="joomla_ut" />
 		<env name="JOOMLA_TEST_DB_PREFIX" value="" />