diff --git a/.github/workflows/pr-mssql-tests.yml b/.github/workflows/pr-mssql-tests.yml
index 9f4a269..ee69c25 100644
--- a/.github/workflows/pr-mssql-tests.yml
+++ b/.github/workflows/pr-mssql-tests.yml
@@ -14,6 +14,7 @@ jobs:
         leia-test:
           - examples/2017
           - examples/2019
+          - examples/2022
         lando-version:
           - 3-dev-slim
         os:
@@ -38,7 +39,7 @@ jobs:
           version: dev
           sync: false
       - name: Setup lando ${{ matrix.lando-version }}
-        uses: lando/setup-lando@v2
+        uses: lando/setup-lando@v3
         with:
           lando-version: ${{ matrix.lando-version }}
           config: |
diff --git a/.lando.yml b/.lando.yml
index 2438bc3..8dd347f 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -1,7 +1,9 @@
 name: lando-mssql-plugin
 services:
   node:
-    type: node:18
+    type: lando
+    services:
+      image: node:18
     build:
       - npm install
     scanner: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 615230d..282c0b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+* Bugfix to address upstream changes to `sqlcmd` path and options causing healthcheck to fail. [#37](https://github.com/lando/mssql/pull/37)
+
 ## v1.2.0 - [July 1, 2024](https://github.com/lando/mssql/releases/tag/v1.2.0)
 
 * Updated to add support for SQL Server 2022. [#34](https://github.com/lando/mssql/issues/34)
diff --git a/builders/mssql.js b/builders/mssql.js
index 2639381..04b58f1 100644
--- a/builders/mssql.js
+++ b/builders/mssql.js
@@ -21,6 +21,7 @@ module.exports = {
       '/sbin',
       '/bin',
       '/opt/mssql-tools/bin',
+      '/opt/mssql-tools18/bin',
     ],
     port: '1433',
   },
diff --git a/docs/index.md b/docs/index.md
index 1ad38ad..4ac3a4f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -20,6 +20,7 @@ services:
 
 * [2022-latest](https://hub.docker.com/_/microsoft-mssql-server)  
 * [2019-latest](https://hub.docker.com/_/microsoft-mssql-server)
+* [2022-latest](https://hub.docker.com/_/microsoft-mssql-server)
 *   **[2017-latest](https://hub.docker.com/_/microsoft-mssql-server)** **(default)**
 *   [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides)
 
diff --git a/examples/2017/README.md b/examples/2017/README.md
index 1fde273..c96da8a 100644
--- a/examples/2017/README.md
+++ b/examples/2017/README.md
@@ -23,7 +23,7 @@ Run the following commands to validate things are rolling as they should.
 
 ```bash
 # Should be able to connect
-lando ssh -s defaults -c "sqlcmd -U sa -H database -P he11oTHERE -Q quit"
+lando ssh -s defaults -c "sqlcmd -U sa -H database -P he11oTHERE -Q quit -C"
 ```
 
 Destroy tests
diff --git a/examples/2019/README.md b/examples/2019/README.md
index 1fde273..c96da8a 100644
--- a/examples/2019/README.md
+++ b/examples/2019/README.md
@@ -23,7 +23,7 @@ Run the following commands to validate things are rolling as they should.
 
 ```bash
 # Should be able to connect
-lando ssh -s defaults -c "sqlcmd -U sa -H database -P he11oTHERE -Q quit"
+lando ssh -s defaults -c "sqlcmd -U sa -H database -P he11oTHERE -Q quit -C"
 ```
 
 Destroy tests
diff --git a/examples/2022/README.md b/examples/2022/README.md
index 1fde273..c96da8a 100644
--- a/examples/2022/README.md
+++ b/examples/2022/README.md
@@ -23,7 +23,7 @@ Run the following commands to validate things are rolling as they should.
 
 ```bash
 # Should be able to connect
-lando ssh -s defaults -c "sqlcmd -U sa -H database -P he11oTHERE -Q quit"
+lando ssh -s defaults -c "sqlcmd -U sa -H database -P he11oTHERE -Q quit -C"
 ```
 
 Destroy tests
diff --git a/package-lock.json b/package-lock.json
index 3ad9dcb..f837c4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "@lando/mssql",
-      "version": "1.1.0",
+      "version": "1.2.0",
       "license": "GPL-3.0",
       "dependencies": {
         "lodash": "^4.17.21"
diff --git a/utils/get-default-healthcheck.js b/utils/get-default-healthcheck.js
index 54eb42f..6a3e326 100644
--- a/utils/get-default-healthcheck.js
+++ b/utils/get-default-healthcheck.js
@@ -8,5 +8,6 @@ module.exports = options => {
     `-H ${options.name}`,
     `-P ${options.creds.password}`,
     `-Q quit`,
+    `-C`,
   ].join(' ');
 };