diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
index e6583762..a37f3a98 100644
--- a/.github/workflows/ci-mssql.yml
+++ b/.github/workflows/ci-mssql.yml
@@ -26,18 +26,21 @@ jobs:
           - php: '8.0'
             extensions: pdo, pdo_sqlsrv
             mssql: 'server:2017-latest'
-          - php: '8.0'
-            extensions: pdo, pdo_sqlsrv
-            mssql: 'server:2019-latest'
           - php: '8.1'
             extensions: pdo, pdo_sqlsrv
             mssql: 'server:2019-latest'
+            odbc-version: 18
+            flag: "-C"
           - php: '8.2'
             extensions: pdo, pdo_sqlsrv
             mssql: 'server:2019-latest'
+            odbc-version: 18
+            flag: "-C"
           - php: '8.3'
             extensions: pdo, pdo_sqlsrv
             mssql: 'server:2019-latest'
+            odbc-version: 18
+            flag: "-C"
 
     services:
       mssql:
@@ -48,7 +51,7 @@ jobs:
           MSSQL_PID: Developer
         ports:
           - 11433:1433
-        options: --name=mssql --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'SSpaSS__1' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3
+        options: --name=mssql --health-cmd="/opt/mssql-tools${{ matrix.odbc-version }}/bin/sqlcmd ${{ matrix.flag }} -S localhost -U SA -P 'SSpaSS__1' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=5
 
     steps:
       - name: Checkout
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 0e3997f1..ae0c677f 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -5,7 +5,6 @@ version: "3"
 services:
   sqlserver:
     image: mcr.microsoft.com/mssql/server:2019-latest
-    restart: always
     ports:
       - "11433:1433"
     environment:
@@ -14,8 +13,6 @@ services:
 
   mysql_latest:
     image: mysql:latest
-    restart: always
-    command: --mysql-native-password=ON
     ports:
       - "13306:3306"
     environment:
@@ -25,7 +22,6 @@ services:
 
   postgres:
     image: postgres:12
-    restart: always
     ports:
       - "15432:5432"
     environment: